feat: remove remaining usages of ClusterName

Signed-off-by: Manan Gupta <[email protected]>
vitessio · Dec 27, 2022 · 6bce6fd · 6bce6fd
1 parent 3ffc36f
commit 6bce6fd
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 10 deletions.
diff --git a/go/vt/vtorc/inst/analysis_dao.go b/go/vt/vtorc/inst/analysis_dao.go
@@ -385,7 +385,6 @@ func GetReplicationAnalysis(keyspace string, shard string, hints *ReplicationAna
 		isStaleBinlogCoordinates := m.GetBool("is_stale_binlog_coordinates")
 		a.ClusterDetails.Keyspace = m.GetString("keyspace")
 		a.ClusterDetails.Shard = m.GetString("shard")
-		a.ClusterDetails.ClusterName = GetClusterNameFromKeyspaceAndShard(a.ClusterDetails.Keyspace, a.ClusterDetails.Shard)
 		a.GTIDMode = m.GetString("gtid_mode")
 		a.LastCheckValid = m.GetBool("is_last_check_valid")
 		a.LastCheckPartialSuccess = m.GetBool("last_check_partial_success")
@@ -440,7 +439,7 @@ func GetReplicationAnalysis(keyspace string, shard string, hints *ReplicationAna
 				log.Infof(analysisMessage)
 			}
 		}
-		keyspaceShard := a.ClusterDetails.ClusterName
+		keyspaceShard := getKeyspaceShardName(a.ClusterDetails.Keyspace, a.ClusterDetails.Shard)
 		if clusters[keyspaceShard] == nil {
 			clusters[keyspaceShard] = &clusterAnalysis{}
 			if a.TabletType == topodatapb.TabletType_PRIMARY {

diff --git a/go/vt/vtorc/inst/cluster.go b/go/vt/vtorc/inst/cluster.go
@@ -18,7 +18,6 @@ package inst
 
 // ClusterInfo makes for a cluster status/info summary
 type ClusterInfo struct {
-	ClusterName                             string
 	Keyspace                                string
 	Shard                                   string
 	CountInstances                          uint

diff --git a/go/vt/vtorc/inst/instance_dao.go b/go/vt/vtorc/inst/instance_dao.go
@@ -454,8 +454,8 @@ Cleanup:
 	return nil, err
 }
 
-// GetClusterNameFromKeyspaceAndShard returns the cluster name from keyspace and shard
-func GetClusterNameFromKeyspaceAndShard(keyspace, shard string) string {
+// getKeyspaceShardName returns a single string having both the keyspace and shard
+func getKeyspaceShardName(keyspace, shard string) string {
 	return fmt.Sprintf("%v:%v", keyspace, shard)
 }
 

diff --git a/go/vt/vtorc/logic/topology_recovery.go b/go/vt/vtorc/logic/topology_recovery.go
@@ -99,7 +99,6 @@ type RecoveryAcknowledgement struct {
 	Comment   string
 
 	Key           inst.InstanceKey
-	ClusterName   string
 	ID            int64
 	UID           string
 	AllRecoveries bool
@@ -108,7 +107,6 @@ type RecoveryAcknowledgement struct {
 // BlockedTopologyRecovery represents an entry in the blocked_topology_recovery table
 type BlockedTopologyRecovery struct {
 	FailedInstanceKey    inst.InstanceKey
-	ClusterName          string
 	Analysis             inst.AnalysisCode
 	LastBlockedTimestamp string
 	BlockingRecoveryID   int64

diff --git a/go/vt/vtorc/logic/topology_recovery_dao.go b/go/vt/vtorc/logic/topology_recovery_dao.go
@@ -204,7 +204,7 @@ func AttemptRecoveryRegistration(analysisEntry *inst.ReplicationAnalysis, failIf
 		}
 		if len(recoveries) > 0 {
 			_ = RegisterBlockedRecoveries(analysisEntry, recoveries)
-			errMsg := fmt.Sprintf("AttemptRecoveryRegistration: cluster %+v has recently experienced a failover (of %+v) and is in active period. It will not be failed over again. You may acknowledge the failure on this cluster (-c ack-cluster-recoveries) or on %+v (-c ack-instance-recoveries) to remove this blockage", analysisEntry.ClusterDetails.ClusterName, recoveries[0].AnalysisEntry.AnalyzedInstanceKey, recoveries[0].AnalysisEntry.AnalyzedInstanceKey)
+			errMsg := fmt.Sprintf("AttemptRecoveryRegistration: keyspace %+v shard %+v has recently experienced a failover (of %+v) and is in active period. It will not be failed over again. You may acknowledge the failure on this cluster (-c ack-cluster-recoveries) or on %+v (-c ack-instance-recoveries) to remove this blockage", analysisEntry.ClusterDetails.Keyspace, analysisEntry.ClusterDetails.Shard, recoveries[0].AnalysisEntry.AnalyzedInstanceKey, recoveries[0].AnalysisEntry.AnalyzedInstanceKey)
 			log.Errorf(errMsg)
 			return nil, fmt.Errorf(errMsg)
 		}

diff --git a/go/vt/vtorc/test/recovery_analysis.go b/go/vt/vtorc/test/recovery_analysis.go
@@ -47,7 +47,6 @@ type InfoForRecoveryAnalysis struct {
 	LogFile                                   string
 	LogPos                                    int64
 	IsStaleBinlogCoordinates                  int
-	ClusterName                               string
 	GTIDMode                                  string
 	LastCheckValid                            int
 	LastCheckPartialSuccess                   int
@@ -160,5 +159,4 @@ func (info *InfoForRecoveryAnalysis) SetValuesFromTabletInfo() {
 	info.DataCenter = info.TabletInfo.Alias.Cell
 	info.Keyspace = info.TabletInfo.Keyspace
 	info.Shard = info.TabletInfo.Shard
-	info.ClusterName = fmt.Sprintf("%v:%v", info.TabletInfo.Keyspace, info.TabletInfo.Shard)
 }