diff --git a/.changelog/8786.txt b/.changelog/8786.txt new file mode 100644 index 0000000000..649b4d0457 --- /dev/null +++ b/.changelog/8786.txt @@ -0,0 +1,3 @@ +```release-note:improvement +server: **(Consul Enterprise only)** ensure that we also shutdown network segment serf instances on server shutdown +``` diff --git a/agent/consul/server.go b/agent/consul/server.go index a478d0c396..57f799472c 100644 --- a/agent/consul/server.go +++ b/agent/consul/server.go @@ -914,6 +914,10 @@ func (s *Server) Shutdown() error { s.serfLAN.Shutdown() } + for _, segment := range s.segmentLAN { + segment.Shutdown() + } + if s.serfWAN != nil { s.serfWAN.Shutdown() if err := s.router.RemoveArea(types.AreaWAN); err != nil {