[release-24.0] tests: stop passing --watch-replication-stream in tests (#20194)

arthurschreiber · web-flow · commit 0854f4f293f4 · 2026-05-27T12:45:32.000+02:00
Signed-off-by: Arthur Schreiber &lt;arthur@planetscale.com&gt;
diff --git a/go/test/endtoend/backup/clone/main_test.go b/go/test/endtoend/backup/clone/main_test.go
@@ -52,7 +52,6 @@ var (
 		vtutils.GetFlagVariantForTests("--vreplication-retry-delay"), "1s",
 		vtutils.GetFlagVariantForTests("--degraded-threshold"), "5s",
 		vtutils.GetFlagVariantForTests("--lock-tables-timeout"), "5s",
-		vtutils.GetFlagVariantForTests("--watch-replication-stream"),
 		vtutils.GetFlagVariantForTests("--enable-replication-reporter"),
 		vtutils.GetFlagVariantForTests("--serving-state-grace-period"), "1s",
 	}
diff --git a/go/test/endtoend/backup/vtbackup/main_test.go b/go/test/endtoend/backup/vtbackup/main_test.go
@@ -47,7 +47,6 @@ var (
 		vtutils.GetFlagVariantForTests("--vreplication-retry-delay"), "1s",
 		vtutils.GetFlagVariantForTests("--degraded-threshold"), "5s",
 		vtutils.GetFlagVariantForTests("--lock-tables-timeout"), "5s",
-		vtutils.GetFlagVariantForTests("--watch-replication-stream"),
 		vtutils.GetFlagVariantForTests("--enable-replication-reporter"),
 		vtutils.GetFlagVariantForTests("--serving-state-grace-period"), "1s",
 	}
diff --git a/go/test/endtoend/backup/vtctlbackup/backup_utils.go b/go/test/endtoend/backup/vtctlbackup/backup_utils.go
@@ -1511,7 +1511,6 @@ func getDefaultCommonArgs() []string {
 		vtutils.GetFlagVariantForTests("--vreplication-retry-delay"), "1s",
 		vtutils.GetFlagVariantForTests("--degraded-threshold"), "5s",
 		vtutils.GetFlagVariantForTests("--lock-tables-timeout"), "5s",
-		vtutils.GetFlagVariantForTests("--watch-replication-stream"),
 		vtutils.GetFlagVariantForTests("--enable-replication-reporter"),
 		vtutils.GetFlagVariantForTests("--serving-state-grace-period"), "1s",
 	}
diff --git a/go/test/endtoend/cellalias/cell_alias_test.go b/go/test/endtoend/cellalias/cell_alias_test.go
@@ -58,7 +58,6 @@ var (
 		utils.GetFlagVariantForTests("--vreplication-retry-delay"), "1s",
 		utils.GetFlagVariantForTests("--degraded-threshold"), "5s",
 		utils.GetFlagVariantForTests("--lock-tables-timeout"), "5s",
-		utils.GetFlagVariantForTests("--watch-replication-stream"),
 		utils.GetFlagVariantForTests("--enable-replication-reporter"),
 		utils.GetFlagVariantForTests("--serving-state-grace-period"), "1s",
 		utils.GetFlagVariantForTests("--binlog-player-protocol"), "grpc",
diff --git a/go/test/endtoend/onlineddl/flow/onlineddl_flow_test.go b/go/test/endtoend/onlineddl/flow/onlineddl_flow_test.go
@@ -141,7 +141,6 @@ func TestMain(m *testing.M) {
 			"--heartbeat_interval", "250ms",
 			"--heartbeat_on_demand_duration", "5s",
 			"--migration_check_interval", "2s",
-			"--watch_replication_stream",
 		}
 		clusterInstance.VtGateExtraArgs = []string{
 			"--ddl_strategy", "online",
diff --git a/go/test/endtoend/onlineddl/revert/onlineddl_revert_test.go b/go/test/endtoend/onlineddl/revert/onlineddl_revert_test.go
@@ -160,7 +160,6 @@ func TestMain(m *testing.M) {
 			utils.GetFlagVariantForTests("--heartbeat-interval"), "250ms",
 			utils.GetFlagVariantForTests("--heartbeat-on-demand-duration"), "5s",
 			utils.GetFlagVariantForTests("--migration-check-interval"), "5s",
-			utils.GetFlagVariantForTests("--watch-replication-stream"),
 		}
 		clusterInstance.VtGateExtraArgs = []string{
 			utils.GetFlagVariantForTests("--ddl-strategy"), "online",
diff --git a/go/test/endtoend/onlineddl/scheduler/onlineddl_scheduler_test.go b/go/test/endtoend/onlineddl/scheduler/onlineddl_scheduler_test.go
@@ -261,7 +261,6 @@ func TestMain(m *testing.M) {
 			utils.GetFlagVariantForTests("--heartbeat-interval"), "250ms",
 			utils.GetFlagVariantForTests("--heartbeat-on-demand-duration"), "5s",
 			utils.GetFlagVariantForTests("--migration-check-interval"), "2s",
-			utils.GetFlagVariantForTests("--watch-replication-stream"),
 		}
 		clusterInstance.VtGateExtraArgs = []string{}
 
diff --git a/go/test/endtoend/onlineddl/vrepl/onlineddl_vrepl_test.go b/go/test/endtoend/onlineddl/vrepl/onlineddl_vrepl_test.go
@@ -182,7 +182,6 @@ func TestMain(m *testing.M) {
 		clusterInstance.VtTabletExtraArgs = []string{
 			utils.GetFlagVariantForTests("--heartbeat-interval"), "250ms",
 			utils.GetFlagVariantForTests("--migration-check-interval"), "5s",
-			utils.GetFlagVariantForTests("--watch-replication-stream"),
 		}
 		clusterInstance.VtGateExtraArgs = []string{
 			utils.GetFlagVariantForTests("--ddl-strategy"), "online",
diff --git a/go/test/endtoend/onlineddl/vrepl_stress/onlineddl_vrepl_mini_stress_test.go b/go/test/endtoend/onlineddl/vrepl_stress/onlineddl_vrepl_mini_stress_test.go
@@ -180,7 +180,6 @@ func TestMain(m *testing.M) {
 			utils.GetFlagVariantForTests("--heartbeat-interval"), "250ms",
 			utils.GetFlagVariantForTests("--heartbeat-on-demand-duration"), "5s",
 			utils.GetFlagVariantForTests("--migration-check-interval"), "5s",
-			utils.GetFlagVariantForTests("--watch-replication-stream"),
 		}
 		clusterInstance.VtGateExtraArgs = []string{
 			utils.GetFlagVariantForTests("--ddl-strategy"), "online",
diff --git a/go/test/endtoend/onlineddl/vrepl_stress_suite/onlineddl_vrepl_stress_suite_test.go b/go/test/endtoend/onlineddl/vrepl_stress_suite/onlineddl_vrepl_stress_suite_test.go
@@ -434,7 +434,6 @@ func TestMain(m *testing.M) {
 			utils.GetFlagVariantForTests("--heartbeat-on-demand-duration"), "5s",
 			utils.GetFlagVariantForTests("--migration-check-interval"), "5s",
 			"--vstream-packet-size", "4096", // Keep this value small and below 10k to ensure multilple vstream iterations
-			utils.GetFlagVariantForTests("--watch-replication-stream"),
 		}
 		clusterInstance.VtGateExtraArgs = []string{
 			utils.GetFlagVariantForTests("--ddl-strategy"), "online",
diff --git a/go/test/endtoend/onlineddl/vrepl_suite/onlineddl_vrepl_suite_test.go b/go/test/endtoend/onlineddl/vrepl_suite/onlineddl_vrepl_suite_test.go
@@ -92,7 +92,6 @@ func TestMain(m *testing.M) {
 			"--heartbeat_interval", "250ms",
 			"--heartbeat_on_demand_duration", "5s",
 			"--migration_check_interval", "5s",
-			"--watch_replication_stream",
 		}
 
 		if err := clusterInstance.StartTopo(); err != nil {
diff --git a/go/test/endtoend/recovery/unshardedrecovery/recovery.go b/go/test/endtoend/recovery/unshardedrecovery/recovery.go
@@ -55,7 +55,6 @@ var (
 		"--vreplication-retry-delay", "1s",
 		vtutils.GetFlagVariantForTests("--degraded-threshold"), "5s",
 		vtutils.GetFlagVariantForTests("--lock-tables-timeout"), "5s",
-		vtutils.GetFlagVariantForTests("--watch-replication-stream"),
 		vtutils.GetFlagVariantForTests("--serving-state-grace-period"), "1s",
 	}
 	recoveryKS1  = "recovery_ks1"
diff --git a/go/test/endtoend/schemadiff/vrepl/schemadiff_vrepl_suite_test.go b/go/test/endtoend/schemadiff/vrepl/schemadiff_vrepl_suite_test.go
@@ -90,7 +90,6 @@ func TestMain(m *testing.M) {
 			utils.GetFlagVariantForTests("--heartbeat-interval"), "250ms",
 			utils.GetFlagVariantForTests("--heartbeat-on-demand-duration"), "5s",
 			utils.GetFlagVariantForTests("--migration-check-interval"), "5s",
-			utils.GetFlagVariantForTests("--watch-replication-stream"),
 		}
 
 		if err := clusterInstance.StartTopo(); err != nil {
diff --git a/go/test/endtoend/tabletmanager/main_test.go b/go/test/endtoend/tabletmanager/main_test.go
@@ -104,7 +104,6 @@ func TestMain(m *testing.M) {
 		// Set extra tablet args for lock timeout
 		clusterInstance.VtTabletExtraArgs = []string{
 			utils.GetFlagVariantForTests("--lock-tables-timeout"), "5s",
-			utils.GetFlagVariantForTests("--watch-replication-stream"),
 			utils.GetFlagVariantForTests("--heartbeat-enable"),
 			utils.GetFlagVariantForTests("--health-check-interval"), tabletHealthcheckRefreshInterval.String(),
 			utils.GetFlagVariantForTests("--unhealthy-threshold"), tabletUnhealthyThreshold.String(),
diff --git a/go/test/endtoend/tabletmanager/primary/tablet_test.go b/go/test/endtoend/tabletmanager/primary/tablet_test.go
@@ -86,7 +86,6 @@ func TestMain(m *testing.M) {
 		// Set extra tablet args for lock timeout
 		clusterInstance.VtTabletExtraArgs = []string{
 			utils.GetFlagVariantForTests("--lock-tables-timeout"), "5s",
-			utils.GetFlagVariantForTests("--watch-replication-stream"),
 			utils.GetFlagVariantForTests("--enable-replication-reporter"),
 		}
 
diff --git a/go/test/endtoend/tabletmanager/tablegc/tablegc_test.go b/go/test/endtoend/tabletmanager/tablegc/tablegc_test.go
@@ -100,7 +100,6 @@ func TestMain(m *testing.M) {
 		// Set extra tablet args for lock timeout
 		clusterInstance.VtTabletExtraArgs = []string{
 			utils.GetFlagVariantForTests("--lock-tables-timeout"), "5s",
-			utils.GetFlagVariantForTests("--watch-replication-stream"),
 			utils.GetFlagVariantForTests("--enable-replication-reporter"),
 			utils.GetFlagVariantForTests("--heartbeat-interval"), "250ms",
 			utils.GetFlagVariantForTests("--gc-check-interval"), gcCheckInterval.String(),
diff --git a/go/test/endtoend/tabletmanager/throttler_topo/throttler_test.go b/go/test/endtoend/tabletmanager/throttler_topo/throttler_test.go
@@ -106,7 +106,6 @@ func TestMain(m *testing.M) {
 		// Set extra tablet args for lock timeout
 		clusterInstance.VtTabletExtraArgs = []string{
 			utils.GetFlagVariantForTests("--lock-tables-timeout"), "5s",
-			utils.GetFlagVariantForTests("--watch-replication-stream"),
 			utils.GetFlagVariantForTests("--enable-replication-reporter"),
 			utils.GetFlagVariantForTests("--heartbeat-interval"), "250ms",
 			utils.GetFlagVariantForTests("--heartbeat-on-demand-duration"), onDemandHeartbeatDuration.String(),
diff --git a/go/test/endtoend/topoconncache/main_test.go b/go/test/endtoend/topoconncache/main_test.go
@@ -53,7 +53,6 @@ var (
 		utils.GetFlagVariantForTests("--vreplication-retry-delay"), "1s",
 		utils.GetFlagVariantForTests("--degraded-threshold"), "5s",
 		utils.GetFlagVariantForTests("--lock-tables-timeout"), "5s",
-		utils.GetFlagVariantForTests("--watch-replication-stream"),
 		utils.GetFlagVariantForTests("--enable-replication-reporter"),
 		utils.GetFlagVariantForTests("--serving-state-grace-period"), "1s",
 		utils.GetFlagVariantForTests("--binlog-player-protocol"), "grpc",
diff --git a/go/test/endtoend/vault/vault_test.go b/go/test/endtoend/vault/vault_test.go
@@ -59,7 +59,6 @@ var (
 		vtutils.GetFlagVariantForTests("--vreplication-retry-delay"), "1s",
 		vtutils.GetFlagVariantForTests("--degraded-threshold"), "5s",
 		vtutils.GetFlagVariantForTests("--lock-tables-timeout"), "5s",
-		vtutils.GetFlagVariantForTests("--watch-replication-stream"),
 		// Frequently reload schema, generating some tablet traffic,
 		//   so we can speed up token refresh
 		"--queryserver-config-schema-reload-time", "5s",
diff --git a/go/test/endtoend/vtgate/foreignkey/stress/fk_stress_test.go b/go/test/endtoend/vtgate/foreignkey/stress/fk_stress_test.go
@@ -359,7 +359,6 @@ func TestMain(m *testing.M) {
 			vtutils.GetFlagVariantForTests("--heartbeat-interval"), "250ms",
 			vtutils.GetFlagVariantForTests("--heartbeat-on-demand-duration"), "5s",
 			vtutils.GetFlagVariantForTests("--migration-check-interval"), "3s",
-			vtutils.GetFlagVariantForTests("--watch-replication-stream"),
 		}
 		clusterInstance.VtGateExtraArgs = []string{}
 

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ var (`
`52`	`52`	`vtutils.GetFlagVariantForTests("--vreplication-retry-delay"), "1s",`
`53`	`53`	`vtutils.GetFlagVariantForTests("--degraded-threshold"), "5s",`
`54`	`54`	`vtutils.GetFlagVariantForTests("--lock-tables-timeout"), "5s",`
`55`		`- vtutils.GetFlagVariantForTests("--watch-replication-stream"),`
`56`	`55`	`vtutils.GetFlagVariantForTests("--enable-replication-reporter"),`
`57`	`56`	`vtutils.GetFlagVariantForTests("--serving-state-grace-period"), "1s",`
`58`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ var (`
`47`	`47`	`vtutils.GetFlagVariantForTests("--vreplication-retry-delay"), "1s",`
`48`	`48`	`vtutils.GetFlagVariantForTests("--degraded-threshold"), "5s",`
`49`	`49`	`vtutils.GetFlagVariantForTests("--lock-tables-timeout"), "5s",`
`50`		`- vtutils.GetFlagVariantForTests("--watch-replication-stream"),`
`51`	`50`	`vtutils.GetFlagVariantForTests("--enable-replication-reporter"),`
`52`	`51`	`vtutils.GetFlagVariantForTests("--serving-state-grace-period"), "1s",`
`53`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1511,7 +1511,6 @@ func getDefaultCommonArgs() []string {`
`1511`	`1511`	`vtutils.GetFlagVariantForTests("--vreplication-retry-delay"), "1s",`
`1512`	`1512`	`vtutils.GetFlagVariantForTests("--degraded-threshold"), "5s",`
`1513`	`1513`	`vtutils.GetFlagVariantForTests("--lock-tables-timeout"), "5s",`
`1514`		`- vtutils.GetFlagVariantForTests("--watch-replication-stream"),`
`1515`	`1514`	`vtutils.GetFlagVariantForTests("--enable-replication-reporter"),`
`1516`	`1515`	`vtutils.GetFlagVariantForTests("--serving-state-grace-period"), "1s",`
`1517`	`1516`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,6 @@ func TestMain(m *testing.M) {`
`141`	`141`	`"--heartbeat_interval", "250ms",`
`142`	`142`	`"--heartbeat_on_demand_duration", "5s",`
`143`	`143`	`"--migration_check_interval", "2s",`
`144`		`- "--watch_replication_stream",`
`145`	`144`	`}`
`146`	`145`	`clusterInstance.VtGateExtraArgs = []string{`
`147`	`146`	`"--ddl_strategy", "online",`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,6 @@ func TestMain(m *testing.M) {`
`160`	`160`	`utils.GetFlagVariantForTests("--heartbeat-interval"), "250ms",`
`161`	`161`	`utils.GetFlagVariantForTests("--heartbeat-on-demand-duration"), "5s",`
`162`	`162`	`utils.GetFlagVariantForTests("--migration-check-interval"), "5s",`
`163`		`- utils.GetFlagVariantForTests("--watch-replication-stream"),`
`164`	`163`	`}`
`165`	`164`	`clusterInstance.VtGateExtraArgs = []string{`
`166`	`165`	`utils.GetFlagVariantForTests("--ddl-strategy"), "online",`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,6 @@ func TestMain(m *testing.M) {`
`261`	`261`	`utils.GetFlagVariantForTests("--heartbeat-interval"), "250ms",`
`262`	`262`	`utils.GetFlagVariantForTests("--heartbeat-on-demand-duration"), "5s",`
`263`	`263`	`utils.GetFlagVariantForTests("--migration-check-interval"), "2s",`
`264`		`- utils.GetFlagVariantForTests("--watch-replication-stream"),`
`265`	`264`	`}`
`266`	`265`	`clusterInstance.VtGateExtraArgs = []string{}`
`267`	`266`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,6 @@ func TestMain(m *testing.M) {`
`182`	`182`	`clusterInstance.VtTabletExtraArgs = []string{`
`183`	`183`	`utils.GetFlagVariantForTests("--heartbeat-interval"), "250ms",`
`184`	`184`	`utils.GetFlagVariantForTests("--migration-check-interval"), "5s",`
`185`		`- utils.GetFlagVariantForTests("--watch-replication-stream"),`
`186`	`185`	`}`
`187`	`186`	`clusterInstance.VtGateExtraArgs = []string{`
`188`	`187`	`utils.GetFlagVariantForTests("--ddl-strategy"), "online",`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,6 @@ func TestMain(m *testing.M) {`
`180`	`180`	`utils.GetFlagVariantForTests("--heartbeat-interval"), "250ms",`
`181`	`181`	`utils.GetFlagVariantForTests("--heartbeat-on-demand-duration"), "5s",`
`182`	`182`	`utils.GetFlagVariantForTests("--migration-check-interval"), "5s",`
`183`		`- utils.GetFlagVariantForTests("--watch-replication-stream"),`
`184`	`183`	`}`
`185`	`184`	`clusterInstance.VtGateExtraArgs = []string{`
`186`	`185`	`utils.GetFlagVariantForTests("--ddl-strategy"), "online",`
Original file line number	Diff line number	Diff line change
`@@ -434,7 +434,6 @@ func TestMain(m *testing.M) {`
`434`	`434`	`utils.GetFlagVariantForTests("--heartbeat-on-demand-duration"), "5s",`
`435`	`435`	`utils.GetFlagVariantForTests("--migration-check-interval"), "5s",`
`436`	`436`	`"--vstream-packet-size", "4096", // Keep this value small and below 10k to ensure multilple vstream iterations`
`437`		`- utils.GetFlagVariantForTests("--watch-replication-stream"),`
`438`	`437`	`}`
`439`	`438`	`clusterInstance.VtGateExtraArgs = []string{`
`440`	`439`	`utils.GetFlagVariantForTests("--ddl-strategy"), "online",`