fix conflict

tanjinx · tanjinx · commit 3fe2f9a2bddd · 2024-11-22T13:56:54.000-08:00
diff --git 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
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ outer:`
`246`	`246`	`require.Fail(t, "timed out - could not verify the new primary")`
`247`	`247`	`case <-time.After(10 * time.Millisecond):`
`248`	`248`	`newPrimary, shouldBuffer := tg.kev.ShouldStartBufferingForTarget(ctx, target)`
`249`		`- if newPrimary != nil && newPrimary.Uid == 1 && !shouldBuffer {`
	`249`	`+ if newPrimary != nil && newPrimary.Uid == replicaTablet.Alias.Uid && !shouldBuffer {`
`250`	`250`	`break outer`
`251`	`251`	`}`
`252`	`252`	`}`