Merge pull request #9347 from gyuho/raft-force-new-cluster

gyuho · web-flow · commit 04e932ba6f9f · 2018-02-26T11:28:56.000-08:00
etcdserver: enable "CheckQuorum" when starting with "ForceNewCluster"
diff --git a/etcdserver/raft.go b/etcdserver/raft.go
@@ -500,6 +500,7 @@ func restartAsStandaloneNode(cfg ServerConfig, snapshot *raftpb.Snapshot) (types
 		Storage:         s,
 		MaxSizePerMsg:   maxSizePerMsg,
 		MaxInflightMsgs: maxInflightMsgs,
+		CheckQuorum:     true,
 	}
 	n := raft.RestartNode(c)
 	raftStatus = n.Status

Original file line number	Diff line number	Diff line change
`@@ -500,6 +500,7 @@ func restartAsStandaloneNode(cfg ServerConfig, snapshot *raftpb.Snapshot) (types`
`500`	`500`	`Storage: s,`
`501`	`501`	`MaxSizePerMsg: maxSizePerMsg,`
`502`	`502`	`MaxInflightMsgs: maxInflightMsgs,`
	`503`	`+ CheckQuorum: true,`
`503`	`504`	`}`
`504`	`505`	`n := raft.RestartNode(c)`
`505`	`506`	`raftStatus = n.Status`