Skip to content

Commit

Permalink
try to perform a leadership transfer when leaving (#11376)
Browse files Browse the repository at this point in the history
* try to perform a leadership transfer when leaving

* add a changelog
  • Loading branch information
dhiaayachi authored Oct 21, 2021
1 parent 9b4ec55 commit f424faf
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .changelog/11376.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
try to transfer leadership to another server when leaving.
```
28 changes: 26 additions & 2 deletions agent/consul/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import (
"sync/atomic"
"time"

"github.com/hashicorp/go-version"

"github.com/armon/go-metrics"
connlimit "github.com/hashicorp/go-connlimit"
"github.com/hashicorp/go-hclog"
Expand Down Expand Up @@ -92,6 +94,8 @@ const (
// from Serf with the Catalog. If this is exhausted we will drop updates,
// and wait for a periodic reconcile.
reconcileChSize = 256

LeaderTransferMinVersion = "1.6.0"
)

const (
Expand Down Expand Up @@ -992,8 +996,28 @@ func (s *Server) Leave() error {
// removed for some reasonable period of time.
isLeader := s.IsLeader()
if isLeader && numPeers > 1 {
if err := s.autopilot.RemoveServer(raft.ServerID(s.config.NodeID)); err != nil {
s.logger.Error("failed to remove ourself as a Raft peer", "error", err)
leadershipTransferVersion := version.Must(version.NewVersion(LeaderTransferMinVersion))
removeServer := false
if ok, _ := ServersInDCMeetMinimumVersion(s, s.config.Datacenter, leadershipTransferVersion); !ok {
// Transfer leadership to another node then leave the cluster
future := s.raft.LeadershipTransfer()
if err := future.Error(); err != nil {
s.logger.Error("failed to transfer leadership, removing the server", "error", err)
// leadership transfer failed, fallback to removing the server from raft
removeServer = true
} else {
// we are not leader anymore, continue the flow to leave as follower
isLeader = false
}
} else {
// Leadership transfer is not available in the current version, fallback to removing the server from raft
removeServer = true
}
if removeServer {
future := s.raft.RemoveServer(raft.ServerID(s.config.NodeID), 0, 0)
if err := future.Error(); err != nil {
s.logger.Error("failed to remove ourself as raft peer", "error", err)
}
}
}

Expand Down

0 comments on commit f424faf

Please sign in to comment.