Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add function to handle enterprise specifics on leave #6453

Merged
merged 1 commit into from
Sep 11, 2019
Merged

Add function to handle enterprise specifics on leave #6453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions agent/consul/enterprise_server_oss.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ func (s *Server) handleEnterpriseRPCConn(rtype pool.RPCType, conn net.Conn, isTL
return false
}

func (s *Server) handleEnterpriseLeave() {
return
}

func (s *Server) enterpriseStats() map[string]map[string]string {
return nil
}
3 changes: 3 additions & 0 deletions agent/consul/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,9 @@ func (s *Server) Leave() error {
}
}

// Leave everything enterprise related as well
s.handleEnterpriseLeave()

// Start refusing RPCs now that we've left the LAN pool. It's important
// to do this *after* we've left the LAN pool so that clients will know
// to shift onto another server if they perform a retry. We also wake up
Expand Down