Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert quorum calculation: (active - 1) < 1+((len(m)-1)/2) calculates quorum after a member is deleted.

Browse Source 
Signed-off-by: Max Neverov <neverov.max@gmail.com>
This commit is contained in:
Max Neverov 2024-04-16 08:28:43 +02:00
parent 3b16aae947
commit c64c996c03
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/etcdserver/server.go
View File

@ -1592,13 +1592,14 @@ func (s *EtcdServer) mayRemoveMember(id types.ID) error {
}
// protect quorum if some members are down
since := time.Now().Add(-HealthInterval)
if !isConnectedToQuorumSince(s.r.transport, since, s.MemberID(), s.cluster.Members()) {
m := s.cluster.VotingMembers()
active := numConnectedSince(s.r.transport, time.Now().Add(-HealthInterval), s.MemberID(), m)
if (active - 1) < 1+((len(m)-1)/2) {
lg.Warn(
"rejecting member remove request; local member has not been connected to all peers, reconfigure breaks active quorum",
zap.String("local-member-id", s.MemberID().String()),
zap.String("requested-member-remove", id.String()),
zap.Int("active-peers", numConnectedSince(s.r.transport, since, s.MemberID(), s.cluster.Members())),
zap.Int("active-peers", active),
zap.Error(errors.ErrUnhealthy),
)
return errors.ErrUnhealthy