Fix missing fields coming from renaming of proto fields +

auto code gen Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
ejortegau · Nov 5, 2024 · 09331a9 · 09331a9
1 parent a29efa7
commit 09331a9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/go/vt/vtctl/grpcvtctldserver/testutil/test_tmclient.go b/go/vt/vtctl/grpcvtctldserver/testutil/test_tmclient.go
@@ -1070,7 +1070,7 @@ func (fake *TabletManagerClient) ReplicationStatus(ctx context.Context, tablet *
 
 	if result, ok := fake.ReplicationStatusResults[key]; ok {
 		if _, ok = fake.BackingUp[key]; ok {
-			result.Position.BackingUp = fake.BackingUp[key]
+			result.Position.BackupRunning = fake.BackingUp[key]
 		}
 		return result.Position, result.Error
 	}

diff --git a/go/vt/vtctl/reparentutil/replication.go b/go/vt/vtctl/reparentutil/replication.go
@@ -217,7 +217,7 @@ func stopReplicationAndBuildStatusMaps(
 
 		stopReplicationStatus, err := tmc.StopReplicationAndGetStatus(groupCtx, tabletInfo.Tablet, replicationdatapb.StopReplicationMode_IOTHREADONLY)
 		m.Lock()
-		res.backingUpTablets[alias] = stopReplicationStatus.GetBackingUp()
+		res.backingUpTablets[alias] = stopReplicationStatus.GetBackupRunning()
 		m.Unlock()
 		if err != nil {
 			sqlErr, isSQLErr := sqlerror.NewSQLErrorFromError(err).(*sqlerror.SQLError)

diff --git a/go/vt/vtctl/reparentutil/util.go b/go/vt/vtctl/reparentutil/util.go
@@ -188,10 +188,10 @@ func findTabletPositionLagBackupStatus(ctx context.Context, tablet *topodatapb.T
 	pos, err := replication.DecodePosition(positionString)
 	if err != nil {
 		logger.Warningf("cannot decode replica position %v for tablet %v, ignoring tablet: %v", positionString, topoproto.TabletAliasString(tablet.Alias), err)
-		return replication.Position{}, 0, status.BackingUp, err
+		return replication.Position{}, 0, status.BackupRunning, err
 	}
 
-	return pos, time.Second * time.Duration(status.ReplicationLagSeconds), status.BackingUp, nil
+	return pos, time.Second * time.Duration(status.ReplicationLagSeconds), status.BackupRunning, nil
 }
 
 // FindCurrentPrimary returns the current primary tablet of a shard, if any. The

diff --git a/go/vt/vtctl/reparentutil/util_test.go b/go/vt/vtctl/reparentutil/util_test.go
@@ -145,12 +145,12 @@ func TestElectNewPrimary(t *testing.T) {
 				// both zone1-101 and zone1-102 are equivalent from a replicaiton PoV, but zone1-102 is taking a backup
 				replicationStatuses: map[string]*replicationdatapb.Status{
 					"zone1-0000000101": {
-						Position:  "MySQL56/3E11FA47-71CA-11E1-9E33-C80AA9429562:1-5",
-						BackingUp: true,
+						Position:      "MySQL56/3E11FA47-71CA-11E1-9E33-C80AA9429562:1-5",
+						BackupRunning: true,
 					},
 					"zone1-0000000102": {
-						Position:  "MySQL56/3E11FA47-71CA-11E1-9E33-C80AA9429562:1-5",
-						BackingUp: false,
+						Position:      "MySQL56/3E11FA47-71CA-11E1-9E33-C80AA9429562:1-5",
+						BackupRunning: false,
 					},
 				},
 			},
@@ -206,8 +206,8 @@ func TestElectNewPrimary(t *testing.T) {
 				// both zone1-101 and zone1-102 are equivalent from a replicaiton PoV, but zone1-102 is taking a backup
 				replicationStatuses: map[string]*replicationdatapb.Status{
 					"zone1-0000000101": {
-						Position:  "MySQL56/3E11FA47-71CA-11E1-9E33-C80AA9429562:1-5",
-						BackingUp: true,
+						Position:      "MySQL56/3E11FA47-71CA-11E1-9E33-C80AA9429562:1-5",
+						BackupRunning: true,
 					},
 				},
 			},
@@ -533,8 +533,8 @@ func TestElectNewPrimary(t *testing.T) {
 						ReplicationLagSeconds: 55,
 					},
 					"zone1-0000000102": {
-						Position:  "MySQL56/3E11FA47-71CA-11E1-9E33-C80AA9429562:1-5",
-						BackingUp: true,
+						Position:      "MySQL56/3E11FA47-71CA-11E1-9E33-C80AA9429562:1-5",
+						BackupRunning: true,
 					},
 				},
 			},

diff --git a/go/vt/vttablet/grpctmserver/server.go b/go/vt/vttablet/grpctmserver/server.go
@@ -342,7 +342,7 @@ func (s *server) MysqlHostMetrics(ctx context.Context, request *tabletmanagerdat
 func (s *server) ReplicationStatus(ctx context.Context, request *tabletmanagerdatapb.ReplicationStatusRequest) (response *tabletmanagerdatapb.ReplicationStatusResponse, err error) {
 	defer s.tm.HandleRPCPanic(ctx, "ReplicationStatus", request, response, false /*verbose*/, &err)
 	ctx = callinfo.GRPCCallInfo(ctx)
-	response = &tabletmanagerdatapb.ReplicationStatusResponse{BackingUp: s.tm.IsBackupRunning()}
+	response = &tabletmanagerdatapb.ReplicationStatusResponse{BackupRunning: s.tm.IsBackupRunning()}
 	status, err := s.tm.ReplicationStatus(ctx)
 	if err == nil {
 		response.Status = status
@@ -626,7 +626,7 @@ func (s *server) StopReplicationAndGetStatus(ctx context.Context, request *table
 		response.Status = statusResponse.Status
 	}
 
-	response.BackingUp = s.tm.IsBackupRunning()
+	response.BackupRunning = s.tm.IsBackupRunning()
 
 	return response, err
 }