schedule: when Region is removed from RegionsInfo, also remove fit ca…

…che (#5865) ref #5860, ref #5864 Signed-off-by: HunDunDM <hundundm@gmail.com>
tikv · Jan 19, 2023 · 6e35a4d · 6e35a4d
1 parent c5bf5be
commit 6e35a4d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
@@ -885,6 +885,7 @@ func (c *RaftCluster) processRegionHeartbeat(region *core.RegionInfo) error {
 				c.regionStats.ClearDefunctRegion(item.GetID())
 			}
 			c.labelLevelStats.ClearDefunctRegion(item.GetID())
+			c.ruleManager.InvalidCache(item.GetID())
 		}
 		regionUpdateCacheEventCounter.Inc()
 	}

diff --git a/server/cluster/cluster_test.go b/server/cluster/cluster_test.go
@@ -902,6 +902,11 @@ func TestRegionHeartbeat(t *testing.T) {
 		re.NoError(err)
 
 		// Check overlap
+		rm := cluster.GetRuleManager()
+		rm.SetPlaceholderRegionFitCache(regions[n-1])
+		rm.SetPlaceholderRegionFitCache(regions[n-2])
+		re.True(rm.CheckIsCachedDirectly(regions[n-1].GetID()))
+		re.True(rm.CheckIsCachedDirectly(regions[n-2].GetID()))
 		overlapRegion = regions[n-1].Clone(
 			core.WithStartKey(regions[n-2].GetStartKey()),
 			core.WithNewRegionID(regions[n-1].GetID()+1),
@@ -911,9 +916,11 @@ func TestRegionHeartbeat(t *testing.T) {
 		ok, err = storage.LoadRegion(regions[n-1].GetID(), region)
 		re.False(ok)
 		re.NoError(err)
+		re.False(rm.CheckIsCachedDirectly(regions[n-1].GetID()))
 		ok, err = storage.LoadRegion(regions[n-2].GetID(), region)
 		re.False(ok)
 		re.NoError(err)
+		re.False(rm.CheckIsCachedDirectly(regions[n-2].GetID()))
 		ok, err = storage.LoadRegion(overlapRegion.GetID(), region)
 		re.True(ok)
 		re.NoError(err)

diff --git a/server/schedule/placement/rule_manager.go b/server/schedule/placement/rule_manager.go
@@ -350,6 +350,24 @@ func (m *RuleManager) InvalidCache(regionID uint64) {
 	m.cache.Invalid(regionID)
 }
 
+// SetPlaceholderRegionFitCache sets a placeholder region fit cache information
+// Only used for testing
+func (m *RuleManager) SetPlaceholderRegionFitCache(region *core.RegionInfo) {
+	placeholderCache := &RegionRuleFitCache{region: toRegionCache(region)}
+	m.cache.mu.Lock()
+	defer m.cache.mu.Unlock()
+	m.cache.caches[region.GetID()] = placeholderCache
+}
+
+// CheckIsCachedDirectly returns whether the region's fit is cached
+// Only used for testing
+func (m *RuleManager) CheckIsCachedDirectly(regionID uint64) bool {
+	m.cache.mu.RLock()
+	defer m.cache.mu.RUnlock()
+	_, ok := m.cache.caches[regionID]
+	return ok
+}
+
 func (m *RuleManager) beginPatch() *ruleConfigPatch {
 	return m.ruleConfig.beginPatch()
 }