mirror of https://github.com/poanetwork/quorum.git
Merge pull request #656 from jbhurat/raft-panic-adding-peer
Adding a node only if it is not in the raft peer list
This commit is contained in:
commit
e9ce8d4668
|
@ -765,7 +765,7 @@ func (pm *ProtocolManager) eventLoop() {
|
||||||
case raftpb.ConfChangeAddNode:
|
case raftpb.ConfChangeAddNode:
|
||||||
if pm.isRaftIdRemoved(raftId) {
|
if pm.isRaftIdRemoved(raftId) {
|
||||||
log.Info("ignoring ConfChangeAddNode for permanently-removed peer", "raft id", raftId)
|
log.Info("ignoring ConfChangeAddNode for permanently-removed peer", "raft id", raftId)
|
||||||
} else if raftId <= uint16(len(pm.bootstrapNodes)) {
|
} else if peer := pm.peers[raftId]; peer != nil && raftId <= uint16(len(pm.bootstrapNodes)) {
|
||||||
// See initial cluster logic in startRaft() for more information.
|
// See initial cluster logic in startRaft() for more information.
|
||||||
log.Info("ignoring expected ConfChangeAddNode for initial peer", "raft id", raftId)
|
log.Info("ignoring expected ConfChangeAddNode for initial peer", "raft id", raftId)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue