fix comments

cadence-workflow · Mar 27, 2018 · 4f6eae2 · 4f6eae2
1 parent 17d79c9
commit 4f6eae2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/service/history/historyTestBase.go b/service/history/historyTestBase.go
@@ -138,13 +138,14 @@ func (s *TestShardContext) GetTransferAckLevel() int64 {
 	s.RLock()
 	defer s.RUnlock()
 
-	// TODO change make this cluster input parameter
+	// TODO cluster should be an input parameter
 	cluster := s.GetService().GetClusterMetadata().GetCurrentClusterName()
-	// if can find corresponding ack level in the cluster to timer ack level map
+	// if we can find corresponding ack level
 	if ackLevel, ok := s.shardInfo.ClusterTransferAckLevel[cluster]; ok {
 		return ackLevel
 	}
 	// otherwise, default to existing ack level, which belongs to local cluster
+	// this can happen if you add more cluster
 	return s.shardInfo.TransferAckLevel
 }
 
@@ -153,7 +154,7 @@ func (s *TestShardContext) UpdateTransferAckLevel(ackLevel int64) error {
 	s.RLock()
 	defer s.RUnlock()
 
-	// TODO change make this cluster input parameter
+	// TODO cluster should be an input parameter
 	cluster := s.GetService().GetClusterMetadata().GetCurrentClusterName()
 	if cluster == s.GetService().GetClusterMetadata().GetCurrentClusterName() {
 		s.shardInfo.TransferAckLevel = ackLevel
@@ -178,11 +179,12 @@ func (s *TestShardContext) GetTimerAckLevel(cluster string) time.Time {
 	s.RLock()
 	defer s.RUnlock()
 
-	// if can find corresponding ack level in the cluster to timer ack level map
+	// if we can find corresponding ack level
 	if ackLevel, ok := s.shardInfo.ClusterTimerAckLevel[cluster]; ok {
 		return ackLevel
 	}
 	// otherwise, default to existing ack level, which belongs to local cluster
+	// this can happen if you add more cluster
 	return s.shardInfo.TimerAckLevel
 }
 

diff --git a/service/history/shardContext.go b/service/history/shardContext.go
@@ -115,13 +115,14 @@ func (s *shardContextImpl) GetTransferAckLevel() int64 {
 	s.RLock()
 	defer s.RUnlock()
 
-	// TODO change make this cluster input parameter
+	// TODO cluster should be an input parameter
 	cluster := s.GetService().GetClusterMetadata().GetCurrentClusterName()
-	// if can find corresponding ack level in the cluster to timer ack level map
+	// if we can find corresponding ack level
 	if ackLevel, ok := s.shardInfo.ClusterTransferAckLevel[cluster]; ok {
 		return ackLevel
 	}
 	// otherwise, default to existing ack level, which belongs to local cluster
+	// this can happen if you add more cluster
 	return s.shardInfo.TransferAckLevel
 }
 
@@ -135,7 +136,7 @@ func (s *shardContextImpl) UpdateTransferAckLevel(ackLevel int64) error {
 	s.Lock()
 	defer s.Unlock()
 
-	// TODO change make this cluster input parameter
+	// TODO cluster should be an input parameter
 	cluster := s.GetService().GetClusterMetadata().GetCurrentClusterName()
 	if cluster == s.GetService().GetClusterMetadata().GetCurrentClusterName() {
 		s.shardInfo.TransferAckLevel = ackLevel
@@ -164,11 +165,12 @@ func (s *shardContextImpl) GetTimerAckLevel(cluster string) time.Time {
 	s.RLock()
 	defer s.RUnlock()
 
-	// if can find corresponding ack level in the cluster to timer ack level map
+	// if we can find corresponding ack level
 	if ackLevel, ok := s.shardInfo.ClusterTimerAckLevel[cluster]; ok {
 		return ackLevel
 	}
 	// otherwise, default to existing ack level, which belongs to local cluster
+	// this can happen if you add more cluster
 	return s.shardInfo.TimerAckLevel
 }
 

diff --git a/service/history/transferQueueProcessor.go b/service/history/transferQueueProcessor.go
@@ -83,7 +83,7 @@ func newTransferQueueProcessor(shard ShardContext, historyService *historyEngine
 		historyClient:     historyClient,
 		visibilityManager: visibilityMgr,
 		cache:             historyService.historyCache,
-		domainCache:       historyService.domainCache,
+		domainCache:       shard.GetDomainCache(),
 	}
 	baseProcessor := newQueueProcessor(shard, options, processor, shard.GetTransferAckLevel())
 	processor.queueProcessorBase = baseProcessor