From 8a5a023b27051505e01637b575924c23cb808de7 Mon Sep 17 00:00:00 2001 From: Harshit Gangal Date: Wed, 9 Aug 2023 16:13:55 +0530 Subject: [PATCH] settings pool is default on, change to run with false as well Signed-off-by: Harshit Gangal --- go/test/endtoend/reparent/prssettingspool/main_test.go | 2 -- go/test/endtoend/vtgate/reservedconn/main_test.go | 2 ++ go/test/endtoend/vtgate/reservedconn/reconnect1/main_test.go | 2 ++ go/test/endtoend/vtgate/reservedconn/reconnect2/main_test.go | 2 ++ go/test/endtoend/vtgate/reservedconn/reconnect3/main_test.go | 2 ++ go/test/endtoend/vtgate/reservedconn/reconnect4/main_test.go | 2 ++ go/test/endtoend/vtgate/unsharded/main_test.go | 2 ++ 7 files changed, 12 insertions(+), 2 deletions(-) diff --git a/go/test/endtoend/reparent/prssettingspool/main_test.go b/go/test/endtoend/reparent/prssettingspool/main_test.go index a9f4312caea..4db66f6a56e 100644 --- a/go/test/endtoend/reparent/prssettingspool/main_test.go +++ b/go/test/endtoend/reparent/prssettingspool/main_test.go @@ -61,8 +61,6 @@ func TestMain(m *testing.M) { Name: keyspaceName, SchemaSQL: schemaSQL, } - clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, - "--queryserver-enable-settings-pool") err = clusterInstance.StartUnshardedKeyspace(*keyspace, 2, false) if err != nil { return 1 diff --git a/go/test/endtoend/vtgate/reservedconn/main_test.go b/go/test/endtoend/vtgate/reservedconn/main_test.go index 9228c00b978..4b56a331dde 100644 --- a/go/test/endtoend/vtgate/reservedconn/main_test.go +++ b/go/test/endtoend/vtgate/reservedconn/main_test.go @@ -134,6 +134,8 @@ func runAllTests(m *testing.M) int { clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-transaction-timeout", "5"} if enableSettingsPool { clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-enable-settings-pool") + } else { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-enable-settings-pool=false") } if err := clusterInstance.StartKeyspace(*keyspace, []string{"-80", "80-"}, 1, false); err != nil { return 1 diff --git a/go/test/endtoend/vtgate/reservedconn/reconnect1/main_test.go b/go/test/endtoend/vtgate/reservedconn/reconnect1/main_test.go index 11325a0f2f8..3c19057780c 100644 --- a/go/test/endtoend/vtgate/reservedconn/reconnect1/main_test.go +++ b/go/test/endtoend/vtgate/reservedconn/reconnect1/main_test.go @@ -98,6 +98,8 @@ func runAllTests(m *testing.M) int { } if enableSettingsPool { clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-enable-settings-pool") + } else { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-enable-settings-pool=false") } if err := clusterInstance.StartKeyspace(*keyspace, []string{"-80", "80-"}, 1, true); err != nil { return 1 diff --git a/go/test/endtoend/vtgate/reservedconn/reconnect2/main_test.go b/go/test/endtoend/vtgate/reservedconn/reconnect2/main_test.go index f97d96ef89a..b2db5d9903d 100644 --- a/go/test/endtoend/vtgate/reservedconn/reconnect2/main_test.go +++ b/go/test/endtoend/vtgate/reservedconn/reconnect2/main_test.go @@ -99,6 +99,8 @@ func runAllTests(m *testing.M) int { clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-transaction-timeout", "5"} if enableSettingsPool { clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-enable-settings-pool") + } else { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-enable-settings-pool=false") } if err := clusterInstance.StartKeyspace(*keyspace, []string{"-80", "80-"}, 1, true); err != nil { return 1 diff --git a/go/test/endtoend/vtgate/reservedconn/reconnect3/main_test.go b/go/test/endtoend/vtgate/reservedconn/reconnect3/main_test.go index 24a68c6cc7b..8aba00a7a0e 100644 --- a/go/test/endtoend/vtgate/reservedconn/reconnect3/main_test.go +++ b/go/test/endtoend/vtgate/reservedconn/reconnect3/main_test.go @@ -73,6 +73,8 @@ func runAllTests(m *testing.M) int { } if enableSettingsPool { clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-enable-settings-pool") + } else { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-enable-settings-pool=false") } if err := clusterInstance.StartUnshardedKeyspace(*keyspace, 2, false); err != nil { return 1 diff --git a/go/test/endtoend/vtgate/reservedconn/reconnect4/main_test.go b/go/test/endtoend/vtgate/reservedconn/reconnect4/main_test.go index 73d30459e0e..963346de994 100644 --- a/go/test/endtoend/vtgate/reservedconn/reconnect4/main_test.go +++ b/go/test/endtoend/vtgate/reservedconn/reconnect4/main_test.go @@ -73,6 +73,8 @@ func runAllTests(m *testing.M) int { } if enableSettingsPool { clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-enable-settings-pool") + } else { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-enable-settings-pool=false") } if err := clusterInstance.StartUnshardedKeyspace(*keyspace, 2, false); err != nil { return 1 diff --git a/go/test/endtoend/vtgate/unsharded/main_test.go b/go/test/endtoend/vtgate/unsharded/main_test.go index 1f25db161ef..f4fe82257c2 100644 --- a/go/test/endtoend/vtgate/unsharded/main_test.go +++ b/go/test/endtoend/vtgate/unsharded/main_test.go @@ -183,6 +183,8 @@ func runAllTests(m *testing.M) int { clusterInstance.VtTabletExtraArgs = []string{"--queryserver-config-transaction-timeout", "3", "--queryserver-config-max-result-size", "30"} if enableSettingsPool { clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-enable-settings-pool") + } else { + clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-enable-settings-pool=false") } if err := clusterInstance.StartUnshardedKeyspace(*Keyspace, 0, false); err != nil { log.Fatal(err.Error())