From 082d6d4703ce0e42b1c85779d5cd8b907e67312a Mon Sep 17 00:00:00 2001 From: Rohit Nayak Date: Sun, 31 Mar 2024 20:20:38 +0200 Subject: [PATCH] Re-enable wait for throttler config to be applied on all shards during e2e tests Signed-off-by: Rohit Nayak --- go/test/endtoend/vreplication/cluster_test.go | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/go/test/endtoend/vreplication/cluster_test.go b/go/test/endtoend/vreplication/cluster_test.go index c6bededa749..b88e919e5ca 100644 --- a/go/test/endtoend/vreplication/cluster_test.go +++ b/go/test/endtoend/vreplication/cluster_test.go @@ -734,27 +734,19 @@ func (vc *VitessCluster) AddShards(t *testing.T, cells []*Cell, keyspace *Keyspa err := vc.VtctlClient.ExecuteCommand("RebuildKeyspaceGraph", keyspace.Name) require.NoError(t, err) - if false { - /* - FIXME: The check for throttler config is failing with - I0318 11:56:57.937571 89514 util.go:363] http Get returns - Get "http://localhost:17101/throttler/status": net/http: HTTP/1.x transport connection broken: - malformed HTTP response "J\x00\x00\x00" - */ - log.Infof("Waiting for throttler config to be applied on all shards") - for _, shardName := range shardNames { - shard := keyspace.Shards[shardName] - for _, tablet := range shard.Tablets { - clusterTablet := &cluster.Vttablet{ - Alias: tablet.Name, - HTTPPort: tablet.Vttablet.Port, - } - log.Infof("+ Waiting for throttler config to be applied on %s, type=%v", tablet.Name, tablet.Vttablet.TabletType) - throttler.WaitForThrottlerStatusEnabled(t, clusterTablet, true, nil, time.Minute) + log.Infof("Waiting for throttler config to be applied on all shards") + for _, shardName := range shardNames { + shard := keyspace.Shards[shardName] + for _, tablet := range shard.Tablets { + clusterTablet := &cluster.Vttablet{ + Alias: tablet.Name, + HTTPPort: tablet.Vttablet.Port, } + log.Infof("+ Waiting for throttler config to be applied on %s, type=%v", tablet.Name, tablet.Vttablet.TabletType) + throttler.WaitForThrottlerStatusEnabled(t, clusterTablet, true, nil, time.Minute) } - log.Infof("Throttler config applied on all shards") } + log.Infof("Throttler config applied on all shards") return nil }