MB-44506 add hostname to transfer tokens

Change-Id: Ie085fe2ee81deaac27cbc6ae9021155229e16c23
couchbase · Mar 3, 2021 · 13ebf4a · 13ebf4a
1 parent 0763320
commit 13ebf4a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/secondary/common/rebalance_defs.go b/secondary/common/rebalance_defs.go
@@ -111,6 +111,10 @@ type TransferToken struct {
 	Error        string
 	BuildSource  TokenBuildSource
 	TransferMode TokenTransferMode
+
+	//used for logging
+	SourceHost string
+	DestHost   string
 }
 
 func (tt TransferToken) Clone() TransferToken {
@@ -128,6 +132,9 @@ func (tt TransferToken) Clone() TransferToken {
 	ttc.BuildSource = tt.BuildSource
 	ttc.TransferMode = tt.TransferMode
 
+	ttc.SourceHost = tt.SourceHost
+	ttc.DestHost = tt.DestHost
+
 	return ttc
 
 }
@@ -136,7 +143,13 @@ func (tt TransferToken) String() string {
 
 	str := fmt.Sprintf(" MasterId: %v ", tt.MasterId)
 	str += fmt.Sprintf("SourceId: %v ", tt.SourceId)
+	if len(tt.SourceHost) != 0 {
+		str += fmt.Sprintf("(%v) ", tt.SourceHost)
+	}
 	str += fmt.Sprintf("DestId: %v ", tt.DestId)
+	if len(tt.DestHost) != 0 {
+		str += fmt.Sprintf("(%v) ", tt.DestHost)
+	}
 	str += fmt.Sprintf("RebalId: %v ", tt.RebalId)
 	str += fmt.Sprintf("State: %v ", tt.State)
 	str += fmt.Sprintf("BuildSource: %v ", tt.BuildSource)

diff --git a/secondary/indexer/rebalancer.go b/secondary/indexer/rebalancer.go
@@ -1341,7 +1341,7 @@ func (r *Rebalancer) computeProgress() (progress float64) {
 	for _, tt := range r.transferTokens {
 		state := tt.State
 		// All states not tested in the if-else if are treated as 0% progress
-		if  state == c.TransferTokenReady  || state == c.TransferTokenMerge ||
+		if state == c.TransferTokenReady || state == c.TransferTokenMerge ||
 			state == c.TransferTokenCommit || state == c.TransferTokenDeleted {
 			totalProgress += 100.00
 		} else if state == c.TransferTokenInProgress {

diff --git a/secondary/planner/executor.go b/secondary/planner/executor.go
@@ -352,6 +352,8 @@ func genTransferToken(solution *Solution, masterId string, topologyChange servic
 						InstId:       index.InstId,
 						IndexInst:    *index.Instance,
 						TransferMode: common.TokenTransferModeMove,
+						SourceHost:   index.initialNode.NodeId,
+						DestHost:     index.destNode.NodeId,
 					}
 
 					token.IndexInst.Defn.InstVersion = token.IndexInst.Version + 1
@@ -410,6 +412,7 @@ func genTransferToken(solution *Solution, masterId string, topologyChange servic
 						InstId:       index.InstId,
 						IndexInst:    *index.Instance,
 						TransferMode: common.TokenTransferModeCopy,
+						DestHost:     index.destNode.NodeId,
 					}
 
 					token.IndexInst.Defn.InstVersion = 1