From 3fe2f9a2bddd768d6a459d1356a441ba73d5f71a Mon Sep 17 00:00:00 2001 From: Tanjin Xu Date: Fri, 22 Nov 2024 13:56:54 -0800 Subject: [PATCH] fix conflict --- go/vt/vtgate/tabletgateway_flaky_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/vt/vtgate/tabletgateway_flaky_test.go b/go/vt/vtgate/tabletgateway_flaky_test.go index 435a014ffbf..d136542d176 100644 --- a/go/vt/vtgate/tabletgateway_flaky_test.go +++ b/go/vt/vtgate/tabletgateway_flaky_test.go @@ -246,7 +246,7 @@ outer: require.Fail(t, "timed out - could not verify the new primary") case <-time.After(10 * time.Millisecond): newPrimary, shouldBuffer := tg.kev.ShouldStartBufferingForTarget(ctx, target) - if newPrimary != nil && newPrimary.Uid == 1 && !shouldBuffer { + if newPrimary != nil && newPrimary.Uid == replicaTablet.Alias.Uid && !shouldBuffer { break outer } }