gh-849: To check the cluster replication type based on cluster spec i…

…nstead of masterdb spec
sorintlab · Oct 7, 2021 · be9619d · be9619d
1 parent fc23394
commit be9619d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cmd/sentinel/cmd/sentinel.go b/cmd/sentinel/cmd/sentinel.go
@@ -1010,10 +1010,11 @@ func (s *Sentinel) updateCluster(cd *cluster.ClusterData, pis cluster.ProxiesInf
 			} else {
 				// if synchronous replication is enabled, only choose new master in the synchronous replication standbys.
 				var bestNewMasterDB *cluster.DB
-				if curMasterDB.Spec.SynchronousReplication {
+				if *cd.Cluster.Spec.SynchronousReplication {
 					commonSyncStandbys := util.CommonElements(curMasterDB.Status.SynchronousStandbys, curMasterDB.Spec.SynchronousStandbys)
 					if len(commonSyncStandbys) == 0 {
 						log.Warnw("cannot choose synchronous standby since there are no common elements between the latest master reported synchronous standbys and the db spec ones", "reported", curMasterDB.Status.SynchronousStandbys, "spec", curMasterDB.Spec.SynchronousStandbys)
+						bestNewMasterDB = bestNewMasters[0]
 					} else {
 						for _, nm := range bestNewMasters {
 							if util.StringInSlice(commonSyncStandbys, nm.UID) {