gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 03:38:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1995 from wallyqs/cluster-size-check

Browse Source 
raft: Fixes to cluster size check for streams
This commit is contained in:
Derek Collison
2021-03-12 05:59:51 -06:00
committed by GitHub
parent 2c27e66f76 60817932a6
commit a4e84ad781
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/raft.go
View File

@@ -317,7 +317,7 @@ func (s *Server) startRaftNode(cfg *RaftConfig) (RaftNode, error) {
if err != nil {
return nil, err
}
if ps == nil || ps.clusterSize < 2 {
if ps == nil || (len(ps.knownPeers) < 2 && ps.clusterSize < 2) {
return nil, errors.New("raft: cluster too small")
}
@@ -1933,9 +1933,13 @@ func (n *raft) applyCommit(index uint64) error {
// FIXME(dlc) - Check if this is us??
if _, ok := n.peers[oldPeer]; ok {
// We should decrease our cluster size since we are tracking this peer.
n.debug("Decreasing our clustersize: %d -> %d", n.csz, n.csz-1)
n.csz--
n.qn = n.csz/2 + 1
if n.csz > 1 {
n.debug("Decreasing our clustersize: %d -> %d", n.csz, n.csz-1)
n.csz--
n.qn = n.csz/2 + 1
} else {
n.warn("Not decreasing further our clustersize: %d", n.csz)
}
delete(n.peers, oldPeer)
}
n.writePeerState(&peerState{n.peerNames(), n.csz})