Ensure timer max query level always above min level (#2944)

temporalio · Jun 3, 2022 · d1f73ad · d1f73ad
1 parent dfbcdce
commit d1f73ad
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/service/history/timerQueueAckMgr.go b/service/history/timerQueueAckMgr.go
@@ -31,17 +31,17 @@ import (
 	"sync"
 	"time"
 
+	"go.temporal.io/server/common"
+	"go.temporal.io/server/common/log"
+	"go.temporal.io/server/common/log/tag"
+	"go.temporal.io/server/common/metrics"
+	"go.temporal.io/server/common/persistence"
 	"go.temporal.io/server/common/primitives/timestamp"
 	ctasks "go.temporal.io/server/common/tasks"
 	"go.temporal.io/server/service/history/configs"
 	"go.temporal.io/server/service/history/queues"
 	"go.temporal.io/server/service/history/shard"
 	"go.temporal.io/server/service/history/tasks"
-
-	"go.temporal.io/server/common/log"
-	"go.temporal.io/server/common/log/tag"
-	"go.temporal.io/server/common/metrics"
-	"go.temporal.io/server/common/persistence"
 )
 
 var (
@@ -177,6 +177,7 @@ func (t *timerQueueAckMgrImpl) getFinishedChan() <-chan struct{} {
 func (t *timerQueueAckMgrImpl) readTimerTasks() ([]queues.Executable, *time.Time, bool, error) {
 	if t.maxQueryLevel == t.minQueryLevel {
 		t.maxQueryLevel = t.shard.GetQueueMaxReadLevel(tasks.CategoryTimer, t.clusterName).FireTime
+		t.maxQueryLevel = common.MaxTime(t.minQueryLevel, t.maxQueryLevel)
 	}
 	minQueryLevel := t.minQueryLevel
 	maxQueryLevel := t.maxQueryLevel