From ebe6aab00dc376ac32c4410d1062828d3bd922c2 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Wed, 12 Feb 2025 10:33:24 -0600 Subject: [PATCH] Fix TestReplicaTransactions assertion Signed-off-by: Florent Poinsard --- go/test/endtoend/tabletgateway/vtgate_test.go | 1 - go/vt/vtgate/buffer/shard_buffer.go | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/go/test/endtoend/tabletgateway/vtgate_test.go b/go/test/endtoend/tabletgateway/vtgate_test.go index d9c87fdc7f3..62973e5285f 100644 --- a/go/test/endtoend/tabletgateway/vtgate_test.go +++ b/go/test/endtoend/tabletgateway/vtgate_test.go @@ -271,7 +271,6 @@ func TestReplicaTransactions(t *testing.T) { require.NoError(t, err) serving := replicaTablet.VttabletProcess.WaitForStatus("SERVING", 60*time.Second) assert.Equal(t, serving, true, "Tablet did not become ready within a reasonable time") - utils.AssertContainsError(t, readConn, fetchAllCustomers, "not found") // create a new connection, should be able to query again readConn, err = mysql.Connect(ctx, &vtParams) diff --git a/go/vt/vtgate/buffer/shard_buffer.go b/go/vt/vtgate/buffer/shard_buffer.go index baf0b42e75c..5a2a6c9ec18 100644 --- a/go/vt/vtgate/buffer/shard_buffer.go +++ b/go/vt/vtgate/buffer/shard_buffer.go @@ -25,13 +25,14 @@ import ( "time" "vitess.io/vitess/go/vt/discovery" + + "vitess.io/vitess/go/vt/vtgate/errorsanitizer" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" + topodatapb "vitess.io/vitess/go/vt/proto/topodata" "vitess.io/vitess/go/vt/topo/topoproto" "vitess.io/vitess/go/vt/vterrors" - "vitess.io/vitess/go/vt/vtgate/errorsanitizer" - - topodatapb "vitess.io/vitess/go/vt/proto/topodata" ) // bufferState represents the different states a shardBuffer object can be in. @@ -488,7 +489,7 @@ func (sb *shardBuffer) recordKeyspaceEvent(alias *topodatapb.TabletAlias, stillS sb.mu.Lock() defer sb.mu.Unlock() - log.V(2).Infof("disruption in shard %s/%s resolved (serving: %v), movetable state %#v", + log.Infof("disruption in shard %s/%s resolved (serving: %v), movetable state %#v", sb.keyspace, sb.shard, stillServing, keyspaceEvent.MoveTablesState) if !topoproto.TabletAliasEqual(alias, sb.currentPrimary) { @@ -551,8 +552,7 @@ func (sb *shardBuffer) stopBufferingLocked(reason stopReason, details string) { utilizationSum.Add(sb.statsKey, utilMax) } - sb. - sb.logErrorIfStateNotLocked(stateBuffering) + sb.logErrorIfStateNotLocked(stateBuffering) sb.state = stateDraining q := sb.queue // Clear the queue such that remove(), oldestEntry() and evictOldestEntry()