Merge pull request #9405 from jpbetz/automated-cherry-pick-of-#9347-origin-release-3.2

gyuho · web-flow · commit fe90bc448ce6 · 2018-03-08T00:59:26.000-08:00
Automated cherry pick of #9347
diff --git a/etcdserver/raft.go b/etcdserver/raft.go
@@ -498,6 +498,7 @@ func restartAsStandaloneNode(cfg *ServerConfig, snapshot *raftpb.Snapshot) (type
 		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
`@@ -498,6 +498,7 @@ func restartAsStandaloneNode(cfg ServerConfig, snapshot raftpb.Snapshot) (type`
`498`	`498`	`Storage: s,`
`499`	`499`	`MaxSizePerMsg: maxSizePerMsg,`
`500`	`500`	`MaxInflightMsgs: maxInflightMsgs,`
	`501`	`+ CheckQuorum: true,`
`501`	`502`	`}`
`502`	`503`	`n := raft.RestartNode(c)`
`503`	`504`	`raftStatus = n.Status`