acl: stop replication on leadership lost

It seems like this was missing. Previously this was only called by init of ACLs during an upgrade.
Now that legacy ACLs are  removed, nothing was calling stop.

Also remove an unused method from client.
This commit is contained in:
Daniel Nephin 2021-10-04 18:22:45 -04:00
parent 15cd8c7ab8
commit a46e3bd2fc
2 changed files with 2 additions and 6 deletions

View File

@ -3,7 +3,6 @@ package consul
import (
"github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/lib/serf"
)
var clientACLCacheConfig *structs.ACLCachesConfig = &structs.ACLCachesConfig{
@ -80,8 +79,3 @@ func (c *Client) ResolveTokenAndDefaultMeta(token string, entMeta *structs.Enter
return authz, err
}
func (c *Client) updateSerfTags(key, value string) {
// Update the LAN serf
serf.UpdateTag(c.serf, key, value)
}

View File

@ -344,6 +344,8 @@ func (s *Server) revokeLeadership() {
s.stopConfigReplication()
s.stopACLReplication()
s.stopConnectLeader()
s.stopACLTokenReaping()