temporalio · yycptt · Jan 27, 2023 · Jan 26, 2023
diff --git a/common/metrics/metric_defs.go b/common/metrics/metric_defs.go
@@ -1412,8 +1412,6 @@ var (
 	ShardInfoVisibilityLagHistogram                   = NewDimensionlessHistogramDef("shardinfo_visibility_lag")
 	ShardInfoImmediateQueueLagHistogram               = NewDimensionlessHistogramDef("shardinfo_immediate_queue_lag")
 	ShardInfoScheduledQueueLagTimer                   = NewTimerDef("shardinfo_scheduled_queue_lag")
-	ShardInfoTransferFailoverLatencyTimer             = NewTimerDef("shardinfo_transfer_failover_latency")
-	ShardInfoTimerFailoverLatencyTimer                = NewTimerDef("shardinfo_timer_failover_latency")
 	SyncShardFromRemoteCounter                        = NewCounterDef("syncshard_remote_count")
 	SyncShardFromRemoteFailure                        = NewCounterDef("syncshard_remote_failed")
 	TaskRequests                                      = NewCounterDef("task_requests")

diff --git a/common/persistence/dataInterfaces.go b/common/persistence/dataInterfaces.go
@@ -163,23 +163,6 @@ type (
 		Msg string
 	}
 
-	// ShardInfoWithFailover describes a shard
-	ShardInfoWithFailover struct {
-		*persistencespb.ShardInfo
-		FailoverLevels map[tasks.Category]map[string]FailoverLevel // uuid -> FailoverLevel
-	}
-
-	// FailoverLevel contains corresponding start / end level
-	// TODO: remove FailoverLevel definition, they are only used by
-	// old queue processing logic
-	FailoverLevel struct {
-		StartTime    time.Time
-		MinLevel     tasks.Key
-		CurrentLevel tasks.Key
-		MaxLevel     tasks.Key
-		NamespaceIDs map[string]struct{}
-	}
-
 	// TaskQueueKey is the struct used to identity TaskQueues
 	TaskQueueKey struct {
 		NamespaceID   string

diff --git a/service/history/historyEngine2_test.go b/service/history/historyEngine2_test.go
@@ -135,11 +135,10 @@ func (s *engine2Suite) SetupTest() {
 	s.config = tests.NewDynamicConfig()
 	mockShard := shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 1,
-				RangeId: 1,
-			}},
+		&persistencespb.ShardInfo{
+			ShardId: 1,
+			RangeId: 1,
+		},
 		s.config,
 	)
 	s.mockShard = mockShard

diff --git a/service/history/historyEngine3_eventsv2_test.go b/service/history/historyEngine3_eventsv2_test.go
@@ -112,10 +112,10 @@ func (s *engine3Suite) SetupTest() {
 
 	s.mockShard = shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{ShardInfo: &persistencespb.ShardInfo{
+		&persistencespb.ShardInfo{
 			ShardId: 1,
 			RangeId: 1,
-		}},
+		},
 		s.config,
 	)
 	s.mockShard.Resource.ShardMgr.EXPECT().AssertShardOwnership(gomock.Any(), gomock.Any()).AnyTimes()

diff --git a/service/history/historyEngine_test.go b/service/history/historyEngine_test.go
@@ -142,11 +142,10 @@ func (s *engineSuite) SetupTest() {
 	s.config = tests.NewDynamicConfig()
 	s.mockShard = shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 1,
-				RangeId: 1,
-			}},
+		&persistencespb.ShardInfo{
+			ShardId: 1,
+			RangeId: 1,
+		},
 		s.config,
 	)
 	s.workflowCache = wcache.NewCache(s.mockShard)

diff --git a/service/history/ndc/activity_replicator_test.go b/service/history/ndc/activity_replicator_test.go
@@ -104,11 +104,10 @@ func (s *activityReplicatorSuite) SetupTest() {
 	s.mockTimerProcessor.EXPECT().NotifyNewTasks(gomock.Any()).AnyTimes()
 	s.mockShard = shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 1,
-				RangeId: 1,
-			}},
+		&persistencespb.ShardInfo{
+			ShardId: 1,
+			RangeId: 1,
+		},
 		tests.NewDynamicConfig(),
 	)
 	s.workflowCache = wcache.NewCache(s.mockShard).(*wcache.CacheImpl)

diff --git a/service/history/ndc/branch_manager_test.go b/service/history/ndc/branch_manager_test.go
@@ -86,11 +86,10 @@ func (s *branchMgrSuite) SetupTest() {
 
 	s.mockShard = shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 10,
-				RangeId: 1,
-			}},
+		&persistencespb.ShardInfo{
+			ShardId: 10,
+			RangeId: 1,
+		},
 		tests.NewDynamicConfig(),
 	)
 

diff --git a/service/history/ndc/conflict_resolver_test.go b/service/history/ndc/conflict_resolver_test.go
@@ -38,7 +38,6 @@ import (
 	"go.temporal.io/server/common/convert"
 	"go.temporal.io/server/common/definition"
 	"go.temporal.io/server/common/log"
-	"go.temporal.io/server/common/persistence"
 	"go.temporal.io/server/common/persistence/versionhistory"
 	"go.temporal.io/server/service/history/shard"
 	"go.temporal.io/server/service/history/tests"
@@ -82,11 +81,10 @@ func (s *conflictResolverSuite) SetupTest() {
 
 	s.mockShard = shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 10,
-				RangeId: 1,
-			}},
+		&persistencespb.ShardInfo{
+			ShardId: 10,
+			RangeId: 1,
+		},
 		tests.NewDynamicConfig(),
 	)
 

diff --git a/service/history/ndc/history_replicator_test.go b/service/history/ndc/history_replicator_test.go
@@ -94,11 +94,10 @@ func (s *historyReplicatorSuite) SetupTest() {
 
 	s.mockShard = shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 10,
-				RangeId: 1,
-			}},
+		&persistencespb.ShardInfo{
+			ShardId: 10,
+			RangeId: 1,
+		},
 		tests.NewDynamicConfig(),
 	)
 

diff --git a/service/history/ndc/resetter_test.go b/service/history/ndc/resetter_test.go
@@ -91,11 +91,10 @@ func (s *resetterSuite) SetupTest() {
 
 	s.mockShard = shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 10,
-				RangeId: 1,
-			}},
+		&persistencespb.ShardInfo{
+			ShardId: 10,
+			RangeId: 1,
+		},
 		tests.NewDynamicConfig(),
 	)
 

diff --git a/service/history/ndc/state_rebuilder_test.go b/service/history/ndc/state_rebuilder_test.go
@@ -94,11 +94,10 @@ func (s *stateRebuilderSuite) SetupTest() {
 
 	s.mockShard = shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 10,
-				RangeId: 1,
-			}},
+		&persistencespb.ShardInfo{
+			ShardId: 10,
+			RangeId: 1,
+		},
 		tests.NewDynamicConfig(),
 	)
 

diff --git a/service/history/ndc/transaction_manager_test.go b/service/history/ndc/transaction_manager_test.go
@@ -88,11 +88,10 @@ func (s *transactionMgrSuite) SetupTest() {
 
 	s.mockShard = shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 10,
-				RangeId: 1,
-			}},
+		&persistencespb.ShardInfo{
+			ShardId: 10,
+			RangeId: 1,
+		},
 		tests.NewDynamicConfig(),
 	)
 

diff --git a/service/history/ndc/workflow_resetter_test.go b/service/history/ndc/workflow_resetter_test.go
@@ -98,11 +98,10 @@ func (s *workflowResetterSuite) SetupTest() {
 
 	s.mockShard = shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 0,
-				RangeId: 1,
-			}},
+		&persistencespb.ShardInfo{
+			ShardId: 0,
+			RangeId: 1,
+		},
 		tests.NewDynamicConfig(),
 	)
 	s.mockExecutionMgr = s.mockShard.Resource.ExecutionMgr

diff --git a/service/history/queues/queue_base_test.go b/service/history/queues/queue_base_test.go
@@ -120,14 +120,12 @@ func (s *queueBaseSuite) TestNewProcessBase_NoPreviousState() {
 
 	mockShard := shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 0,
-				RangeId: rangeID,
-				QueueAckLevels: map[int32]*persistencespb.QueueAckLevel{
-					tasks.CategoryIDTransfer: {
-						AckLevel: ackLevel,
-					},
+		&persistencespb.ShardInfo{
+			ShardId: 0,
+			RangeId: rangeID,
+			QueueAckLevels: map[int32]*persistencespb.QueueAckLevel{
+				tasks.CategoryIDTransfer: {
+					AckLevel: ackLevel,
 				},
 			},
 		},
@@ -207,13 +205,11 @@ func (s *queueBaseSuite) TestNewProcessBase_WithPreviousState() {
 
 	mockShard := shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 0,
-				RangeId: 10,
-				QueueStates: map[int32]*persistencespb.QueueState{
-					tasks.CategoryIDTransfer: persistenceState,
-				},
+		&persistencespb.ShardInfo{
+			ShardId: 0,
+			RangeId: 10,
+			QueueStates: map[int32]*persistencespb.QueueState{
+				tasks.CategoryIDTransfer: persistenceState,
 			},
 		},
 		s.config,
@@ -248,14 +244,12 @@ func (s *queueBaseSuite) TestNewProcessBase_WithPreviousState() {
 func (s *queueBaseSuite) TestStartStop() {
 	mockShard := shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 0,
-				RangeId: 10,
-				QueueAckLevels: map[int32]*persistencespb.QueueAckLevel{
-					tasks.CategoryIDTransfer: {
-						AckLevel: 1024,
-					},
+		&persistencespb.ShardInfo{
+			ShardId: 0,
+			RangeId: 10,
+			QueueAckLevels: map[int32]*persistencespb.QueueAckLevel{
+				tasks.CategoryIDTransfer: {
+					AckLevel: 1024,
 				},
 			},
 		},
@@ -318,13 +312,11 @@ func (s *queueBaseSuite) TestProcessNewRange() {
 
 	mockShard := shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 0,
-				RangeId: 10,
-				QueueStates: map[int32]*persistencespb.QueueState{
-					tasks.CategoryIDTimer: persistenceState,
-				},
+		&persistencespb.ShardInfo{
+			ShardId: 0,
+			RangeId: 10,
+			QueueStates: map[int32]*persistencespb.QueueState{
+				tasks.CategoryIDTimer: persistenceState,
 			},
 		},
 		s.config,
@@ -375,13 +367,11 @@ func (s *queueBaseSuite) TestCheckPoint_WithPendingTasks() {
 
 	mockShard := shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 0,
-				RangeId: 10,
-				QueueStates: map[int32]*persistencespb.QueueState{
-					tasks.CategoryIDTimer: persistenceState,
-				},
+		&persistencespb.ShardInfo{
+			ShardId: 0,
+			RangeId: 10,
+			QueueStates: map[int32]*persistencespb.QueueState{
+				tasks.CategoryIDTimer: persistenceState,
 			},
 		},
 		s.config,
@@ -449,13 +439,11 @@ func (s *queueBaseSuite) TestCheckPoint_NoPendingTasks() {
 
 	mockShard := shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 0,
-				RangeId: 10,
-				QueueStates: map[int32]*persistencespb.QueueState{
-					tasks.CategoryIDTimer: persistenceState,
-				},
+		&persistencespb.ShardInfo{
+			ShardId: 0,
+			RangeId: 10,
+			QueueStates: map[int32]*persistencespb.QueueState{
+				tasks.CategoryIDTimer: persistenceState,
 			},
 		},
 		s.config,
@@ -538,13 +526,11 @@ func (s *queueBaseSuite) TestCheckPoint_MoveSlices() {
 
 	mockShard := shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 0,
-				RangeId: 10,
-				QueueStates: map[int32]*persistencespb.QueueState{
-					tasks.CategoryIDTimer: initialPersistenceState,
-				},
+		&persistencespb.ShardInfo{
+			ShardId: 0,
+			RangeId: 10,
+			QueueStates: map[int32]*persistencespb.QueueState{
+				tasks.CategoryIDTimer: initialPersistenceState,
 			},
 		},
 		s.config,

diff --git a/service/history/queues/queue_scheduled_test.go b/service/history/queues/queue_scheduled_test.go
@@ -73,11 +73,9 @@ func (s *scheduledQueueSuite) SetupTest() {
 	s.controller = gomock.NewController(s.T())
 	s.mockShard = shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 0,
-				RangeId: 1,
-			},
+		&persistencespb.ShardInfo{
+			ShardId: 0,
+			RangeId: 1,
 		},
 		tests.NewDynamicConfig(),
 	)

diff --git a/service/history/replication/ack_manager_test.go b/service/history/replication/ack_manager_test.go
@@ -98,11 +98,10 @@ func (s *ackManagerSuite) SetupTest() {
 
 	s.mockShard = shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId: 0,
-				RangeId: 1,
-			}},
+		&persistencespb.ShardInfo{
+			ShardId: 0,
+			RangeId: 1,
+		},
 		tests.NewDynamicConfig(),
 	)
 

diff --git a/service/history/replication/dlq_handler_test.go b/service/history/replication/dlq_handler_test.go
@@ -94,12 +94,11 @@ func (s *dlqHandlerSuite) SetupTest() {
 
 	s.mockShard = shard.NewTestContext(
 		s.controller,
-		&persistence.ShardInfoWithFailover{
-			ShardInfo: &persistencespb.ShardInfo{
-				ShardId:                0,
-				RangeId:                1,
-				ReplicationDlqAckLevel: map[string]int64{cluster.TestAlternativeClusterName: persistence.EmptyQueueMessageID},
-			}},
+		&persistencespb.ShardInfo{
+			ShardId:                0,
+			RangeId:                1,
+			ReplicationDlqAckLevel: map[string]int64{cluster.TestAlternativeClusterName: persistence.EmptyQueueMessageID},
+		},
 		tests.NewDynamicConfig(),
 	)
 	s.mockResource = s.mockShard.Resource