From 3ca99adcca238068a6c43006dafbf80660f8018c Mon Sep 17 00:00:00 2001 From: Byron Ruth Date: Thu, 8 Jun 2023 07:10:27 -0400 Subject: [PATCH 1/2] Update Go to 1.19.10 Signed-off-by: Byron Ruth --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9db44524..3f4e2e6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ vm: language: go go: - - 1.19.9 + - 1.19.10 addons: apt: From 6d9955d212b85a489c33b956e89c54af14ef0e2c Mon Sep 17 00:00:00 2001 From: Neil Twigg Date: Thu, 8 Jun 2023 15:25:18 +0100 Subject: [PATCH 2/2] Send peer state when adding peers Signed-off-by: Neil Twigg --- server/raft.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/server/raft.go b/server/raft.go index 3e1088d9..e625c47b 100644 --- a/server/raft.go +++ b/server/raft.go @@ -1474,12 +1474,6 @@ func (n *raft) Peers() []*Peer { // Update our known set of peers. func (n *raft) UpdateKnownPeers(knownPeers []string) { n.Lock() - // If this is a scale up, let the normal add peer logic take precedence. - // Otherwise if the new peers are slow to start we stall ourselves. - if len(knownPeers) > len(n.peers) { - n.Unlock() - return - } // Process like peer state update. ps := &peerState{knownPeers, len(knownPeers), n.extSt} n.processPeerState(ps)