status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 98823e573f
commit 0d0761927a
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/consul/acl_client.go
View File

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

2
agent/consul/leader.go
View File

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