Merge pull request #1711 from lixiaobing10051267/masterRaft2

raftpb.ConfChange also include ConfChangeUpdateNode
moby · Oct 28, 2016 · e5f95e1 · e5f95e1
2 parents 137c3d1 + 661128f
commit e5f95e1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/manager/state/raft/raft.go b/manager/state/raft/raft.go
@@ -1689,7 +1689,7 @@ func getIDs(snap *raftpb.Snapshot, ents []raftpb.Entry) []uint64 {
 		case raftpb.ConfChangeUpdateNode:
 			// do nothing
 		default:
-			log.L.Panic("ConfChange Type should be either ConfChangeAddNode or ConfChangeRemoveNode!")
+			log.L.Panic("ConfChange Type should be either ConfChangeAddNode, or ConfChangeRemoveNode, or ConfChangeUpdateNode!")
 		}
 	}
 	var sids []uint64