Merge branch 'master' into check-server-start

tikv · Jan 2, 2025 · 6186e8c · 6186e8c
2 parents 650f562 + 0bfa31f
commit 6186e8c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
@@ -2283,7 +2283,8 @@ func (c *RaftCluster) CheckAndUpdateMinResolvedTS() (uint64, bool) {
 			newMinResolvedTS = s.GetMinResolvedTS()
 		}
 	}
-	oldMinResolvedTS := c.minResolvedTS.Load().(uint64)
+	// Avoid panic when minResolvedTS is not initialized.
+	oldMinResolvedTS, _ := c.minResolvedTS.Load().(uint64)
 	if newMinResolvedTS == math.MaxUint64 || newMinResolvedTS <= oldMinResolvedTS {
 		return oldMinResolvedTS, false
 	}