From aa92d9acb8d16d2d241470e9dd83c41c48f6203b Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Fri, 29 Sep 2023 10:17:16 -0600 Subject: [PATCH 1/3] remove --vtctld_addr usages as it is deprecated Signed-off-by: Florent Poinsard --- examples/common/scripts/vttablet-up.sh | 1 - examples/compose/vttablet-up.sh | 1 - go/test/endtoend/cluster/vttablet_process.go | 2 -- vitess-mixin/e2e/vttablet-up.sh | 1 - 4 files changed, 5 deletions(-) diff --git a/examples/common/scripts/vttablet-up.sh b/examples/common/scripts/vttablet-up.sh index e1437992e10..951eaeff6dd 100755 --- a/examples/common/scripts/vttablet-up.sh +++ b/examples/common/scripts/vttablet-up.sh @@ -53,7 +53,6 @@ vttablet \ --grpc_port $grpc_port \ --service_map 'grpc-queryservice,grpc-tabletmanager,grpc-updatestream' \ --pid_file $VTDATAROOT/$tablet_dir/vttablet.pid \ - --vtctld_addr http://$hostname:$vtctld_web_port/ \ --heartbeat_enable --heartbeat_interval=250ms --heartbeat_on_demand_duration=5s \ > $VTDATAROOT/$tablet_dir/vttablet.out 2>&1 & diff --git a/examples/compose/vttablet-up.sh b/examples/compose/vttablet-up.sh index a4bf31a5c42..f41b31f025c 100755 --- a/examples/compose/vttablet-up.sh +++ b/examples/compose/vttablet-up.sh @@ -154,7 +154,6 @@ exec $VTROOT/bin/vttablet \ --port $web_port \ --grpc_port $grpc_port \ --service_map 'grpc-queryservice,grpc-tabletmanager,grpc-updatestream' \ - --vtctld_addr "http://vtctld:$WEB_PORT/" \ --init_keyspace $keyspace \ --init_shard $shard \ --backup_storage_implementation file \ diff --git a/go/test/endtoend/cluster/vttablet_process.go b/go/test/endtoend/cluster/vttablet_process.go index 96d6dd04ef0..f9f83f6b295 100644 --- a/go/test/endtoend/cluster/vttablet_process.go +++ b/go/test/endtoend/cluster/vttablet_process.go @@ -108,8 +108,6 @@ func (vttablet *VttabletProcess) Setup() (err error) { "--backup_storage_implementation", vttablet.BackupStorageImplementation, "--file_backup_storage_root", vttablet.FileBackupStorageRoot, "--service_map", vttablet.ServiceMap, - "--vtctld_addr", vttablet.VtctldAddress, - "--vtctld_addr", vttablet.VtctldAddress, "--vreplication_tablet_type", vttablet.VreplicationTabletType, "--db_charset", vttablet.Charset, ) diff --git a/vitess-mixin/e2e/vttablet-up.sh b/vitess-mixin/e2e/vttablet-up.sh index a4bf31a5c42..f41b31f025c 100755 --- a/vitess-mixin/e2e/vttablet-up.sh +++ b/vitess-mixin/e2e/vttablet-up.sh @@ -154,7 +154,6 @@ exec $VTROOT/bin/vttablet \ --port $web_port \ --grpc_port $grpc_port \ --service_map 'grpc-queryservice,grpc-tabletmanager,grpc-updatestream' \ - --vtctld_addr "http://vtctld:$WEB_PORT/" \ --init_keyspace $keyspace \ --init_shard $shard \ --backup_storage_implementation file \ From 5663227f51bb3bfbf18092b817936dbd9fdc2f78 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Fri, 29 Sep 2023 11:54:48 -0600 Subject: [PATCH 2/3] remove queryserver-config-schema-change-signal-interval if binary version >= 17 Signed-off-by: Florent Poinsard --- go/test/endtoend/onlineddl/revert/onlineddl_revert_test.go | 5 ++++- go/test/endtoend/utils/mysqlvsvitess/main_test.go | 5 ++++- go/test/endtoend/vtgate/gen4/main_test.go | 5 ++++- go/test/endtoend/vtgate/main_test.go | 5 ++++- go/test/endtoend/vtgate/queries/aggregation/main_test.go | 5 ++++- go/test/endtoend/vtgate/queries/foundrows/main_test.go | 5 ++++- .../endtoend/vtgate/queries/informationschema/main_test.go | 5 ++++- go/test/endtoend/vtgate/queries/lookup_queries/main_test.go | 5 ++++- go/test/endtoend/vtgate/queries/orderby/main_test.go | 5 ++++- go/test/endtoend/vtgate/queries/subquery/main_test.go | 5 ++++- go/test/endtoend/vtgate/queries/union/main_test.go | 5 ++++- .../schematracker/restarttablet/schema_restart_test.go | 6 +++--- .../vtgate/schematracker/sharded/st_sharded_test.go | 4 +++- .../vtgate/schematracker/sharded_prs/st_sharded_test.go | 5 ++++- .../vtgate/schematracker/unauthorized/unauthorized_test.go | 6 +++++- .../vtgate/schematracker/unsharded/st_unsharded_test.go | 5 ++++- 16 files changed, 63 insertions(+), 18 deletions(-) diff --git a/go/test/endtoend/onlineddl/revert/onlineddl_revert_test.go b/go/test/endtoend/onlineddl/revert/onlineddl_revert_test.go index dd0b6d84a53..b3d4d82b6fe 100644 --- a/go/test/endtoend/onlineddl/revert/onlineddl_revert_test.go +++ b/go/test/endtoend/onlineddl/revert/onlineddl_revert_test.go @@ -30,6 +30,7 @@ import ( "time" "vitess.io/vitess/go/mysql" + "vitess.io/vitess/go/test/endtoend/utils" "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/schema" @@ -154,9 +155,11 @@ func TestMain(m *testing.M) { "--heartbeat_interval", "250ms", "--heartbeat_on_demand_duration", "5s", "--migration_check_interval", "5s", - "--queryserver-config-schema-change-signal-interval", "0.1", "--watch_replication_stream", } + if !utils.BinaryIsAtVersion(17, "vttablet") { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-config-schema-change-signal-interval", "0.1") + } clusterInstance.VtGateExtraArgs = []string{ "--ddl_strategy", "online", } diff --git a/go/test/endtoend/utils/mysqlvsvitess/main_test.go b/go/test/endtoend/utils/mysqlvsvitess/main_test.go index f59132c3858..63a24c776c9 100644 --- a/go/test/endtoend/utils/mysqlvsvitess/main_test.go +++ b/go/test/endtoend/utils/mysqlvsvitess/main_test.go @@ -83,7 +83,10 @@ func TestMain(m *testing.M) { VSchema: vschema, } clusterInstance.VtGateExtraArgs = []string{"--schema_change_signal"} - clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal", "--queryserver-config-schema-change-signal-interval", "0.1"} + clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal"} + if !utils.BinaryIsAtVersion(17, "vttablet") { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-config-schema-change-signal-interval", "0.1") + } err = clusterInstance.StartKeyspace(*keyspace, []string{"-80", "80-"}, 0, false) if err != nil { return 1 diff --git a/go/test/endtoend/vtgate/gen4/main_test.go b/go/test/endtoend/vtgate/gen4/main_test.go index cc50cbba40a..30db8b5ed4a 100644 --- a/go/test/endtoend/vtgate/gen4/main_test.go +++ b/go/test/endtoend/vtgate/gen4/main_test.go @@ -85,7 +85,10 @@ func TestMain(m *testing.M) { } clusterInstance.VtGateExtraArgs = []string{"--schema_change_signal"} - clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal", "--queryserver-config-schema-change-signal-interval", "0.1"} + clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal"} + if !utils.BinaryIsAtVersion(17, "vttablet") { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-config-schema-change-signal-interval", "0.1") + } err = clusterInstance.StartKeyspace(*sKs, shardedKsShards, 0, false) if err != nil { return 1 diff --git a/go/test/endtoend/vtgate/main_test.go b/go/test/endtoend/vtgate/main_test.go index 1d2bc59b50a..9770b174f4a 100644 --- a/go/test/endtoend/vtgate/main_test.go +++ b/go/test/endtoend/vtgate/main_test.go @@ -73,7 +73,10 @@ func TestMain(m *testing.M) { VSchema: VSchema, } clusterInstance.VtGateExtraArgs = []string{"--schema_change_signal"} - clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal", "--queryserver-config-schema-change-signal-interval", "0.1", "--queryserver-config-max-result-size", "100", "--queryserver-config-terse-errors"} + clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal", "--queryserver-config-max-result-size", "100", "--queryserver-config-terse-errors"} + if !utils.BinaryIsAtVersion(17, "vttablet") { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-config-schema-change-signal-interval", "0.1") + } err = clusterInstance.StartKeyspace(*keyspace, []string{"-80", "80-"}, 0, false) if err != nil { return 1 diff --git a/go/test/endtoend/vtgate/queries/aggregation/main_test.go b/go/test/endtoend/vtgate/queries/aggregation/main_test.go index a859002f44a..e62082c44fe 100644 --- a/go/test/endtoend/vtgate/queries/aggregation/main_test.go +++ b/go/test/endtoend/vtgate/queries/aggregation/main_test.go @@ -64,7 +64,10 @@ func TestMain(m *testing.M) { VSchema: vschema, } clusterInstance.VtGateExtraArgs = []string{"--schema_change_signal"} - clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal", "--queryserver-config-schema-change-signal-interval", "0.1"} + clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal"} + if !utils.BinaryIsAtVersion(17, "vttablet") { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-config-schema-change-signal-interval", "0.1") + } err = clusterInstance.StartKeyspace(*keyspace, []string{"-80", "80-"}, 0, false) if err != nil { return 1 diff --git a/go/test/endtoend/vtgate/queries/foundrows/main_test.go b/go/test/endtoend/vtgate/queries/foundrows/main_test.go index e0d9d737efa..e2fb9d9ef5f 100644 --- a/go/test/endtoend/vtgate/queries/foundrows/main_test.go +++ b/go/test/endtoend/vtgate/queries/foundrows/main_test.go @@ -66,7 +66,10 @@ func TestMain(m *testing.M) { VSchema: vschema, } clusterInstance.VtGateExtraArgs = []string{"--schema_change_signal"} - clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal", "--queryserver-config-schema-change-signal-interval", "0.1"} + clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal"} + if !utils.BinaryIsAtVersion(17, "vttablet") { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-config-schema-change-signal-interval", "0.1") + } err = clusterInstance.StartKeyspace(*keyspace, []string{"-80", "80-"}, 0, false) if err != nil { return 1 diff --git a/go/test/endtoend/vtgate/queries/informationschema/main_test.go b/go/test/endtoend/vtgate/queries/informationschema/main_test.go index c15c546dfc9..ab7ccdfd3d9 100644 --- a/go/test/endtoend/vtgate/queries/informationschema/main_test.go +++ b/go/test/endtoend/vtgate/queries/informationschema/main_test.go @@ -72,7 +72,10 @@ func TestMain(m *testing.M) { VSchema: vschema, } clusterInstance.VtGateExtraArgs = []string{"--schema_change_signal"} - clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal", "--queryserver-config-schema-change-signal-interval", "0.1"} + clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal"} + if !utils.BinaryIsAtVersion(17, "vttablet") { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-config-schema-change-signal-interval", "0.1") + } err = clusterInstance.StartKeyspace(*keyspace, []string{"-80", "80-"}, 0, false) if err != nil { return 1 diff --git a/go/test/endtoend/vtgate/queries/lookup_queries/main_test.go b/go/test/endtoend/vtgate/queries/lookup_queries/main_test.go index 9660c25e0cd..3d70ffa50a5 100644 --- a/go/test/endtoend/vtgate/queries/lookup_queries/main_test.go +++ b/go/test/endtoend/vtgate/queries/lookup_queries/main_test.go @@ -69,7 +69,10 @@ func TestMain(m *testing.M) { VSchema: shardedVSchema, } - clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal-interval", "0.1"} + clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal"} + if !utils.BinaryIsAtVersion(17, "vttablet") { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-config-schema-change-signal-interval", "0.1") + } err = clusterInstance.StartKeyspace(*sKs, shardedKsShards, 0, false) if err != nil { return 1 diff --git a/go/test/endtoend/vtgate/queries/orderby/main_test.go b/go/test/endtoend/vtgate/queries/orderby/main_test.go index c073e615c1f..fc539fb2ba2 100644 --- a/go/test/endtoend/vtgate/queries/orderby/main_test.go +++ b/go/test/endtoend/vtgate/queries/orderby/main_test.go @@ -64,7 +64,10 @@ func TestMain(m *testing.M) { VSchema: vschema, } clusterInstance.VtGateExtraArgs = []string{"--schema_change_signal"} - clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal", "--queryserver-config-schema-change-signal-interval", "0.1"} + clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal"} + if !utils.BinaryIsAtVersion(17, "vttablet") { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-config-schema-change-signal-interval", "0.1") + } err = clusterInstance.StartKeyspace(*keyspace, []string{"-80", "80-"}, 0, false) if err != nil { return 1 diff --git a/go/test/endtoend/vtgate/queries/subquery/main_test.go b/go/test/endtoend/vtgate/queries/subquery/main_test.go index 2053518178d..d6f56e6ff64 100644 --- a/go/test/endtoend/vtgate/queries/subquery/main_test.go +++ b/go/test/endtoend/vtgate/queries/subquery/main_test.go @@ -64,7 +64,10 @@ func TestMain(m *testing.M) { VSchema: VSchema, } clusterInstance.VtGateExtraArgs = []string{"--schema_change_signal"} - clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal", "--queryserver-config-schema-change-signal-interval", "0.1"} + clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal"} + if !utils.BinaryIsAtVersion(17, "vttablet") { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-config-schema-change-signal-interval", "0.1") + } err = clusterInstance.StartKeyspace(*keyspace, []string{"-80", "80-"}, 0, false) if err != nil { return 1 diff --git a/go/test/endtoend/vtgate/queries/union/main_test.go b/go/test/endtoend/vtgate/queries/union/main_test.go index ea3577f3af8..f4696107a8e 100644 --- a/go/test/endtoend/vtgate/queries/union/main_test.go +++ b/go/test/endtoend/vtgate/queries/union/main_test.go @@ -63,7 +63,10 @@ func TestMain(m *testing.M) { VSchema: vschema, } clusterInstance.VtGateExtraArgs = []string{"--schema_change_signal"} - clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal", "--queryserver-config-schema-change-signal-interval", "0.1"} + clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal"} + if !utils.BinaryIsAtVersion(17, "vttablet") { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-config-schema-change-signal-interval", "0.1") + } err = clusterInstance.StartKeyspace(*keyspace, []string{"-80", "80-"}, 0, false) if err != nil { return 1 diff --git a/go/test/endtoend/vtgate/schematracker/restarttablet/schema_restart_test.go b/go/test/endtoend/vtgate/schematracker/restarttablet/schema_restart_test.go index adbba68c460..a614b658d42 100644 --- a/go/test/endtoend/vtgate/schematracker/restarttablet/schema_restart_test.go +++ b/go/test/endtoend/vtgate/schematracker/restarttablet/schema_restart_test.go @@ -91,9 +91,9 @@ func TestMain(m *testing.M) { // restart the tablet so that the schema.Engine gets a chance to start with existing schema tablet := clusterInstance.Keyspaces[0].Shards[0].PrimaryTablet() - tablet.VttabletProcess.ExtraArgs = []string{ - "--queryserver-config-schema-change-signal", - fmt.Sprintf("--queryserver-config-schema-change-signal-interval=%d", signalInterval), + tablet.VttabletProcess.ExtraArgs = []string{"--queryserver-config-schema-change-signal"} + if !utils.BinaryIsAtVersion(17, "vttablet") { + tablet.VttabletProcess.ExtraArgs = append(tablet.VttabletProcess.ExtraArgs, fmt.Sprintf("--queryserver-config-schema-change-signal-interval=%d", signalInterval)) } if err := tablet.RestartOnlyTablet(); err != nil { return 1 diff --git a/go/test/endtoend/vtgate/schematracker/sharded/st_sharded_test.go b/go/test/endtoend/vtgate/schematracker/sharded/st_sharded_test.go index 5bcd319b6d5..c248d9c520f 100644 --- a/go/test/endtoend/vtgate/schematracker/sharded/st_sharded_test.go +++ b/go/test/endtoend/vtgate/schematracker/sharded/st_sharded_test.go @@ -91,11 +91,13 @@ func TestMain(m *testing.M) { "--schema_change_signal_user", "userData1"} clusterInstance.VtGatePlannerVersion = planbuilder.Gen4 clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal", - "--queryserver-config-schema-change-signal-interval", "0.1", "--queryserver-config-strict-table-acl", "--queryserver-config-acl-exempt-acl", "userData1", "--table-acl-config", "dummy.json"} + if vttabletVer <= 16 { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-config-schema-change-signal-interval", "0.1") + } if vtgateVer >= 16 && vttabletVer >= 16 { clusterInstance.VtGateExtraArgs = append(clusterInstance.VtGateExtraArgs, "--enable-views") clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-enable-views") diff --git a/go/test/endtoend/vtgate/schematracker/sharded_prs/st_sharded_test.go b/go/test/endtoend/vtgate/schematracker/sharded_prs/st_sharded_test.go index 8ad110b2572..6d8cb2b18c4 100644 --- a/go/test/endtoend/vtgate/schematracker/sharded_prs/st_sharded_test.go +++ b/go/test/endtoend/vtgate/schematracker/sharded_prs/st_sharded_test.go @@ -146,7 +146,10 @@ func TestMain(m *testing.M) { } clusterInstance.VtGateExtraArgs = []string{"--schema_change_signal", "--schema_change_signal_user", "userData1"} - clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal", "--queryserver-config-schema-change-signal-interval", "5", "--queryserver-config-strict-table-acl", "--queryserver-config-acl-exempt-acl", "userData1", "--table-acl-config", "dummy.json"} + clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal", "--queryserver-config-strict-table-acl", "--queryserver-config-acl-exempt-acl", "userData1", "--table-acl-config", "dummy.json"} + if !utils.BinaryIsAtVersion(17, "vttablet") { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-config-schema-change-signal-interval", "5") + } // Start topo server err = clusterInstance.StartTopo() diff --git a/go/test/endtoend/vtgate/schematracker/unauthorized/unauthorized_test.go b/go/test/endtoend/vtgate/schematracker/unauthorized/unauthorized_test.go index c8fa2de2f20..f8bb7fa048d 100644 --- a/go/test/endtoend/vtgate/schematracker/unauthorized/unauthorized_test.go +++ b/go/test/endtoend/vtgate/schematracker/unauthorized/unauthorized_test.go @@ -29,6 +29,8 @@ import ( "github.com/stretchr/testify/require" + "vitess.io/vitess/go/test/endtoend/utils" + "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/test/endtoend/cluster" ) @@ -69,10 +71,12 @@ func TestMain(m *testing.M) { clusterInstance.VtGateExtraArgs = append(clusterInstance.VtGateExtraArgs, "--schema_change_signal") clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-config-schema-change-signal", - "--queryserver-config-schema-change-signal-interval", "0.1", "--queryserver-config-strict-table-acl", "--queryserver-config-acl-exempt-acl", "userData1", "--table-acl-config", "dummy.json") + if !utils.BinaryIsAtVersion(17, "vttablet") { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-config-schema-change-signal-interval", "0.1") + } err = clusterInstance.StartKeyspace(*keyspace, []string{"-80", "80-"}, 0, false) if err != nil { return 1 diff --git a/go/test/endtoend/vtgate/schematracker/unsharded/st_unsharded_test.go b/go/test/endtoend/vtgate/schematracker/unsharded/st_unsharded_test.go index 720ab124c12..78ebd562796 100644 --- a/go/test/endtoend/vtgate/schematracker/unsharded/st_unsharded_test.go +++ b/go/test/endtoend/vtgate/schematracker/unsharded/st_unsharded_test.go @@ -83,7 +83,10 @@ func TestMain(m *testing.M) { SchemaSQL: sqlSchema, SidecarDBName: sidecarDBName, } - clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal", "--queryserver-config-schema-change-signal-interval", "0.1"} + clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-schema-change-signal"} + if !utils.BinaryIsAtVersion(17, "vttablet") { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-config-schema-change-signal-interval", "0.1") + } err = clusterInstance.StartUnshardedKeyspace(*keyspace, 0, false) if err != nil { return 1 From 4ee69f09c8739117a7649317eabdf3e6fb7d31ed Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Fri, 29 Sep 2023 16:33:43 -0600 Subject: [PATCH 3/3] remove disable-replication-manager in tests if vttablet >= v17 Signed-off-by: Florent Poinsard --- go/test/endtoend/reparent/utils/utils.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/go/test/endtoend/reparent/utils/utils.go b/go/test/endtoend/reparent/utils/utils.go index e712cf0990f..91804c25293 100644 --- a/go/test/endtoend/reparent/utils/utils.go +++ b/go/test/endtoend/reparent/utils/utils.go @@ -31,6 +31,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "vitess.io/vitess/go/test/endtoend/utils" + querypb "vitess.io/vitess/go/vt/proto/query" "vitess.io/vitess/go/vt/vttablet/tabletconn" @@ -63,7 +65,7 @@ var ( replicationWaitTimeout = time.Duration(15 * time.Second) ) -//region cluster setup/teardown +// region cluster setup/teardown // SetupReparentCluster is used to setup the reparent cluster func SetupReparentCluster(t *testing.T, durability string) *cluster.LocalProcessCluster { @@ -138,18 +140,22 @@ func setupCluster(ctx context.Context, t *testing.T, shardName string, cells []s // If the initSchema acquires the lock, then it takes about 30 seconds for it to run during which time the // DemotePrimary rpc is stalled! "--queryserver_enable_online_ddl=false", + ) + + if !utils.BinaryIsAtVersion(17, "vttablet") { // disabling active reparents on the tablet since we don't want the replication manager // to fix replication if it is stopped. Some tests deliberately do that. Also, we don't want // the replication manager to silently fix the replication in case ERS or PRS mess up. All the // tests in this test suite should work irrespective of this flag. Each run of ERS, PRS should be // setting up the replication correctly. - "--disable-replication-manager") + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--disable-replication-manager") + } // Initialize Cluster err = clusterInstance.SetupCluster(keyspace, []cluster.Shard{*shard}) require.NoError(t, err, "Cannot launch cluster") - //Start MySql + // Start MySql var mysqlCtlProcessList []*exec.Cmd for _, shard := range clusterInstance.Keyspaces[0].Shards { for _, tablet := range shard.Vttablets { @@ -252,7 +258,7 @@ func StartNewVTTablet(t *testing.T, clusterInstance *cluster.LocalProcessCluster return tablet } -//endregion +// endregion // region database queries func getMysqlConnParam(tablet *cluster.Vttablet) mysql.ConnParams { @@ -280,7 +286,7 @@ func execute(t *testing.T, conn *mysql.Conn, query string) *sqltypes.Result { return qr } -//endregion +// endregion // region ers, prs