use original context for mm shard conclude and add command test

Signed-off-by: Harshit Gangal <harshit@planetscale.com>
vitessio · Sep 4, 2024 · 73f1a84 · 73f1a84
1 parent b03c109
commit 73f1a84
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/go/test/endtoend/tabletmanager/commands_test.go b/go/test/endtoend/tabletmanager/commands_test.go
@@ -81,8 +81,14 @@ func TestTabletCommands(t *testing.T) {
  require.NoError(t, err)
  })
  t.Run("ConcludeTransaction", func(t *testing.T) {
- _, err := clusterInstance.VtctldClientProcess.ExecuteCommandWithOutput("ConcludeTransaction", "ks:-80:1234", "ks/80-")
- require.NoError(t, err)
+ output, err := clusterInstance.VtctldClientProcess.ExecuteCommandWithOutput("ConcludeTransaction", "ks:0:1234")
+ assert.NoError(t, err)
+ assert.Contains(t, output, "Successfully concluded the distributed transaction")
+ })
+ t.Run("ConcludeTransaction with participants", func(t *testing.T) {
+ output, err := clusterInstance.VtctldClientProcess.ExecuteCommandWithOutput("ConcludeTransaction", "ks:0:1234", "ks/0")
+ assert.NoError(t, err)
+ assert.Contains(t, output, "Successfully concluded the distributed transaction")
  })
  // check Ping / RefreshState / RefreshStateByShard
  err = clusterInstance.VtctldClientProcess.ExecuteCommand("PingTablet", primaryTablet.Alias)

diff --git a/go/vt/vtctl/grpcvtctldserver/server.go b/go/vt/vtctl/grpcvtctldserver/server.go
@@ -2468,7 +2468,7 @@ func (s *VtctldServer) ConcludeTransaction(ctx context.Context, req *vtctldatapb
  return nil, err
  }
 
- if err = s.tmc.ConcludeTransaction(newCtx, primary.Tablet, req.Dtid, true); err != nil {
+ if err = s.tmc.ConcludeTransaction(ctx, primary.Tablet, req.Dtid, true); err != nil {
  return nil, err
  }