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

…nstead of masterdb spec
sorintlab · Oct 7, 2021 · 5322008 · 5322008
1 parent 3bb7499
commit 5322008
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
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) {

diff --git a/cmd/sentinel/cmd/sentinel_test.go b/cmd/sentinel/cmd/sentinel_test.go
@@ -597,10 +597,11 @@ func TestUpdateCluster(t *testing.T) {
 					UID:        "cluster1",
 					Generation: 1,
 					Spec: &cluster.ClusterSpec{
-						ConvergenceTimeout:   &cluster.Duration{Duration: cluster.DefaultConvergenceTimeout},
-						InitTimeout:          &cluster.Duration{Duration: cluster.DefaultInitTimeout},
-						SyncTimeout:          &cluster.Duration{Duration: cluster.DefaultSyncTimeout},
-						MaxStandbysPerSender: cluster.Uint16P(cluster.DefaultMaxStandbysPerSender),
+						ConvergenceTimeout:     &cluster.Duration{Duration: cluster.DefaultConvergenceTimeout},
+						InitTimeout:            &cluster.Duration{Duration: cluster.DefaultInitTimeout},
+						SyncTimeout:            &cluster.Duration{Duration: cluster.DefaultSyncTimeout},
+						MaxStandbysPerSender:   cluster.Uint16P(cluster.DefaultMaxStandbysPerSender),
+						SynchronousReplication: cluster.BoolP(false),
 					},
 					Status: cluster.ClusterStatus{
 						CurrentGeneration: 1,
@@ -685,10 +686,11 @@ func TestUpdateCluster(t *testing.T) {
 					UID:        "cluster1",
 					Generation: 1,
 					Spec: &cluster.ClusterSpec{
-						ConvergenceTimeout:   &cluster.Duration{Duration: cluster.DefaultConvergenceTimeout},
-						InitTimeout:          &cluster.Duration{Duration: cluster.DefaultInitTimeout},
-						SyncTimeout:          &cluster.Duration{Duration: cluster.DefaultSyncTimeout},
-						MaxStandbysPerSender: cluster.Uint16P(cluster.DefaultMaxStandbysPerSender),
+						ConvergenceTimeout:     &cluster.Duration{Duration: cluster.DefaultConvergenceTimeout},
+						InitTimeout:            &cluster.Duration{Duration: cluster.DefaultInitTimeout},
+						SyncTimeout:            &cluster.Duration{Duration: cluster.DefaultSyncTimeout},
+						MaxStandbysPerSender:   cluster.Uint16P(cluster.DefaultMaxStandbysPerSender),
+						SynchronousReplication: cluster.BoolP(false),
 					},
 					Status: cluster.ClusterStatus{
 						CurrentGeneration: 1,
@@ -1127,10 +1129,11 @@ func TestUpdateCluster(t *testing.T) {
 					UID:        "cluster1",
 					Generation: 1,
 					Spec: &cluster.ClusterSpec{
-						ConvergenceTimeout:   &cluster.Duration{Duration: cluster.DefaultConvergenceTimeout},
-						InitTimeout:          &cluster.Duration{Duration: cluster.DefaultInitTimeout},
-						SyncTimeout:          &cluster.Duration{Duration: cluster.DefaultSyncTimeout},
-						MaxStandbysPerSender: cluster.Uint16P(cluster.DefaultMaxStandbysPerSender),
+						ConvergenceTimeout:     &cluster.Duration{Duration: cluster.DefaultConvergenceTimeout},
+						InitTimeout:            &cluster.Duration{Duration: cluster.DefaultInitTimeout},
+						SyncTimeout:            &cluster.Duration{Duration: cluster.DefaultSyncTimeout},
+						MaxStandbysPerSender:   cluster.Uint16P(cluster.DefaultMaxStandbysPerSender),
+						SynchronousReplication: cluster.BoolP(false),
 					},
 					Status: cluster.ClusterStatus{
 						CurrentGeneration: 1,
@@ -1215,10 +1218,11 @@ func TestUpdateCluster(t *testing.T) {
 					UID:        "cluster1",
 					Generation: 1,
 					Spec: &cluster.ClusterSpec{
-						ConvergenceTimeout:   &cluster.Duration{Duration: cluster.DefaultConvergenceTimeout},
-						InitTimeout:          &cluster.Duration{Duration: cluster.DefaultInitTimeout},
-						SyncTimeout:          &cluster.Duration{Duration: cluster.DefaultSyncTimeout},
-						MaxStandbysPerSender: cluster.Uint16P(cluster.DefaultMaxStandbysPerSender),
+						ConvergenceTimeout:     &cluster.Duration{Duration: cluster.DefaultConvergenceTimeout},
+						InitTimeout:            &cluster.Duration{Duration: cluster.DefaultInitTimeout},
+						SyncTimeout:            &cluster.Duration{Duration: cluster.DefaultSyncTimeout},
+						MaxStandbysPerSender:   cluster.Uint16P(cluster.DefaultMaxStandbysPerSender),
+						SynchronousReplication: cluster.BoolP(false),
 					},
 					Status: cluster.ClusterStatus{
 						CurrentGeneration: 1,