Skip to content

Commit

Permalink
Fix breakage from concurrent merge
Browse files Browse the repository at this point in the history
We merged these two PRs concurrently and thus
ended up with a breakage:
  - #14735
  - #14786

This PR addresses that issue by using a locally
scoped vtgate connection according to the newly
established model.

Signed-off-by: Matt Lord <[email protected]>
  • Loading branch information
mattlord committed Dec 27, 2023
1 parent 4bb84ed commit ef7fbd2
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions go/test/endtoend/vreplication/vdiff2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ func TestVDiff2(t *testing.T) {
}

func testWorkflow(t *testing.T, vc *VitessCluster, tc *testCase, tks *Keyspace, cells []*Cell) {
vtgateConn := vc.GetVTGateConn(t)
defer vtgateConn.Close()
arrTargetShards := strings.Split(tc.targetShards, ",")
if tc.typ == "Reshard" {
require.NoError(t, vc.AddShards(t, cells, tks, tc.targetShards, 0, 0, tc.tabletBaseID, targetKsOpts))
Expand Down

0 comments on commit ef7fbd2

Please sign in to comment.