Enforce time resolution for timerMaxReadLevel (#3411)

yycptt · alexshtin · commit 711d4c18b67c · 2020-09-25T18:54:08.000-07:00
* Truncate timerMaxReadLevel to millisecond
* Add Stringer method for timerTaskKey
diff --git a/service/history/shardContext.go b/service/history/shardContext.go
@@ -446,7 +446,7 @@ func (s *shardContextImpl) UpdateTimerMaxReadLevel(cluster string) time.Time {
 		currentTime = s.remoteClusterCurrentTime[cluster]
 	}
 
-	s.timerMaxReadLevelMap[cluster] = currentTime.Add(s.config.TimerProcessorMaxTimeShift())
+	s.timerMaxReadLevelMap[cluster] = currentTime.Add(s.config.TimerProcessorMaxTimeShift()).Truncate(time.Millisecond)
 	return s.timerMaxReadLevelMap[cluster]
 }
 
@@ -1222,6 +1222,8 @@ func acquireShard(
 		} else { // active cluster
 			timerMaxReadLevelMap[clusterName] = currentReadTime
 		}
+
+		timerMaxReadLevelMap[clusterName] = timerMaxReadLevelMap[clusterName].Truncate(time.Millisecond)
 	}
 
 	executionMgr, err := shardItem.GetExecutionManager(shardItem.shardID)

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ func (s *shardContextImpl) UpdateTimerMaxReadLevel(cluster string) time.Time {`
`446`	`446`	`currentTime = s.remoteClusterCurrentTime[cluster]`
`447`	`447`	`}`
`448`	`448`
`449`		`- s.timerMaxReadLevelMap[cluster] = currentTime.Add(s.config.TimerProcessorMaxTimeShift())`
	`449`	`+ s.timerMaxReadLevelMap[cluster] = currentTime.Add(s.config.TimerProcessorMaxTimeShift()).Truncate(time.Millisecond)`
`450`	`450`	`return s.timerMaxReadLevelMap[cluster]`
`451`	`451`	`}`
`452`	`452`
`@@ -1222,6 +1222,8 @@ func acquireShard(`
`1222`	`1222`	`} else { // active cluster`
`1223`	`1223`	`timerMaxReadLevelMap[clusterName] = currentReadTime`
`1224`	`1224`	`}`
	`1225`	`+`
	`1226`	`+ timerMaxReadLevelMap[clusterName] = timerMaxReadLevelMap[clusterName].Truncate(time.Millisecond)`
`1225`	`1227`	`}`
`1226`	`1228`
`1227`	`1229`	`executionMgr, err := shardItem.GetExecutionManager(shardItem.shardID)`