poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #815 from jpmorganchase/raft-issue-795-fix 

Raft issue 795 fix
This commit is contained in:
Zhou Zhiyao 2019-09-10 09:51:46 +08:00 committed by GitHub
parent 664c2ab20a 77731de614
commit 58fc5cd59d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
raft/handler.go
View File

@ -765,7 +765,7 @@ func (pm *ProtocolManager) eventLoop() {
case raftpb.ConfChangeAddNode:
if pm.isRaftIdRemoved(raftId) {
log.Info("ignoring ConfChangeAddNode for permanently-removed peer", "raft id", raftId)
} else if peer := pm.peers[raftId]; peer != nil && raftId <= uint16(len(pm.bootstrapNodes)) {
} else if pm.isRaftIdUsed(raftId) && raftId <= uint16(len(pm.bootstrapNodes)) {
// See initial cluster logic in startRaft() for more information.
log.Info("ignoring expected ConfChangeAddNode for initial peer", "raft id", raftId)