From 9a96d47ccb6fac4b873a487149b328d17faadf4b Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Thu, 20 Feb 2025 20:12:11 +0100 Subject: [PATCH] fix dupe tablet read from backend Signed-off-by: Tim Vaillancourt --- go/vt/vtorc/inst/instance_dao.go | 2 +- go/vt/vtorc/inst/tablet_dao.go | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/go/vt/vtorc/inst/instance_dao.go b/go/vt/vtorc/inst/instance_dao.go index c61fbab46d4..26165baf8c6 100644 --- a/go/vt/vtorc/inst/instance_dao.go +++ b/go/vt/vtorc/inst/instance_dao.go @@ -204,7 +204,7 @@ func ReadTopologyInstanceBufferable(tabletAlias string, latency *stopwatch.Named goto Cleanup } - fs, err = fullStatus(tabletAlias) + fs, err = fullStatus(tablet) if err != nil { goto Cleanup } diff --git a/go/vt/vtorc/inst/tablet_dao.go b/go/vt/vtorc/inst/tablet_dao.go index af304292a70..5beccc09a29 100644 --- a/go/vt/vtorc/inst/tablet_dao.go +++ b/go/vt/vtorc/inst/tablet_dao.go @@ -44,11 +44,7 @@ func InitializeTMC() tmclient.TabletManagerClient { } // fullStatus gets the full status of the MySQL running in vttablet. -func fullStatus(tabletAlias string) (*replicationdatapb.FullStatus, error) { - tablet, err := ReadTablet(tabletAlias) - if err != nil { - return nil, err - } +func fullStatus(tablet *topodatapb.Tablet) (*replicationdatapb.FullStatus, error) { tmcCtx, tmcCancel := context.WithTimeout(context.Background(), topo.RemoteOperationTimeout) defer tmcCancel() return tmc.FullStatus(tmcCtx, tablet)