From 8885c8d318cf56170f4e0baf0e46e882dde35223 Mon Sep 17 00:00:00 2001 From: Matt Keeler Date: Mon, 23 Sep 2019 20:09:56 -0400 Subject: [PATCH] Allow for enterprise only leader routines (#6533) Eventually I am thinking we may need a way to register these at different priority levels but for now sticking this here is fine --- agent/consul/enterprise_server_oss.go | 8 ++++++++ agent/consul/leader.go | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/agent/consul/enterprise_server_oss.go b/agent/consul/enterprise_server_oss.go index 238cbffde..b17a7ca0b 100644 --- a/agent/consul/enterprise_server_oss.go +++ b/agent/consul/enterprise_server_oss.go @@ -41,3 +41,11 @@ func (s *Server) handleEnterpriseLeave() { func (s *Server) enterpriseStats() map[string]map[string]string { return nil } + +func (s *Server) establishEnterpriseLeadership() error { + return nil +} + +func (s *Server) revokeEnterpriseLeadership() error { + return nil +} diff --git a/agent/consul/leader.go b/agent/consul/leader.go index 33efb4fc1..2c961e431 100644 --- a/agent/consul/leader.go +++ b/agent/consul/leader.go @@ -309,6 +309,10 @@ func (s *Server) establishLeadership() error { return err } + if err := s.establishEnterpriseLeadership(); err != nil { + return err + } + // attempt to bootstrap config entries if err := s.bootstrapConfigEntries(s.config.ConfigEntryBootstrap); err != nil { return err @@ -340,6 +344,8 @@ func (s *Server) revokeLeadership() { // are no longer responsible for session expirations. s.clearAllSessionTimers() + s.revokeEnterpriseLeadership() + s.stopConfigReplication() s.stopConnectLeader()