Merge pull request #12914 from ptabor/20210430-read-membership

No-storeV2: Read membership information from the backend (Part5)
etcd-io · May 4, 2021 · a3fc535 · a3fc535
2 parents eb128d2 + 205a1a4
commit a3fc535
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/server/etcdserver/api/membership/cluster.go b/server/etcdserver/api/membership/cluster.go
@@ -253,11 +253,12 @@ func (c *RaftCluster) Recover(onSet func(*zap.Logger, *semver.Version)) {
 	c.Lock()
 	defer c.Unlock()
 
-	c.members, c.removed = membersFromStore(c.lg, c.v2store)
 	if c.be != nil {
 		c.version = clusterVersionFromBackend(c.lg, c.be)
+		c.members, c.removed = membersFromBackend(c.lg, c.be)
 	} else {
 		c.version = clusterVersionFromStore(c.lg, c.v2store)
+		c.members, c.removed = membersFromStore(c.lg, c.v2store)
 	}
 
 	if c.be != nil {