Cherry-pick 888df92 with conflicts

vitessio · Jul 18, 2023 · 62e7e35 · 62e7e35
1 parent 6b38810
commit 62e7e35
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/go/test/endtoend/vtorc/primaryfailure/primary_failure_test.go b/go/test/endtoend/vtorc/primaryfailure/primary_failure_test.go
@@ -34,13 +34,19 @@ import (
 func TestDownPrimary(t *testing.T) {
  defer utils.PrintVTOrcLogsOnFailure(t, clusterInfo.ClusterInstance)
  defer cluster.PanicHandler(t)
+<<<<<<< HEAD
 <<<<<<< HEAD
  utils.SetupVttabletsAndVTOrcs(t, clusterInfo, 2, 1, nil, cluster.VTOrcConfiguration{
 =======
+=======
+>>>>>>> 888df9228e (Fix flakiness in VTOrc tests (#13489))
  // We specify the --wait-replicas-timeout to a small value because we spawn a cross-cell replica later in the test.
  // If that replica is more advanced than the same-cell-replica, then we try to promote the cross-cell replica as an intermediate source.
  // If we don't specify a small value of --wait-replicas-timeout, then we would end up waiting for 30 seconds for the dead-primary to respond, failing this test.
  utils.SetupVttabletsAndVTOrcs(t, clusterInfo, 2, 1, []string{"--remote_operation_timeout=10s", "--wait-replicas-timeout=5s"}, cluster.VTOrcConfiguration{
+<<<<<<< HEAD
+>>>>>>> 888df9228e (Fix flakiness in VTOrc tests (#13489))
+=======
 >>>>>>> 888df9228e (Fix flakiness in VTOrc tests (#13489))
  PreventCrossDataCenterPrimaryFailover: true,
  }, 1, "semi_sync")

diff --git a/go/test/endtoend/vtorc/utils/utils.go b/go/test/endtoend/vtorc/utils/utils.go
@@ -1000,4 +1000,7 @@ func PrintVTOrcLogsOnFailure(t *testing.T, clusterInstance *cluster.LocalProcess
  log.Errorf("%s", string(content))
  }
 }
+<<<<<<< HEAD
+>>>>>>> 888df9228e (Fix flakiness in VTOrc tests (#13489))
+=======
 >>>>>>> 888df9228e (Fix flakiness in VTOrc tests (#13489))
diff --git a/go/vt/vtorc/inst/instance_dao.go b/go/vt/vtorc/inst/instance_dao.go
@@ -104,6 +104,9 @@ func initializeInstanceDao() {
 =======
  forgetAliases = cache.New(time.Duration(config.Config.InstancePollSeconds*3)*time.Second, time.Second)
  cacheInitializationCompleted.Store(true)
+<<<<<<< HEAD
+>>>>>>> 888df9228e (Fix flakiness in VTOrc tests (#13489))
+=======
 >>>>>>> 888df9228e (Fix flakiness in VTOrc tests (#13489))
 }
 

diff --git a/go/vt/vtorc/inst/instance_dao_test.go b/go/vt/vtorc/inst/instance_dao_test.go
@@ -645,4 +645,7 @@ func waitForCacheInitialization() {
  time.Sleep(100 * time.Millisecond)
  }
 }
+<<<<<<< HEAD
+>>>>>>> 888df9228e (Fix flakiness in VTOrc tests (#13489))
+=======
 >>>>>>> 888df9228e (Fix flakiness in VTOrc tests (#13489))