Merge branch 'release-7.1' into cherry-pick-8675-to-release-7.1

tikv · Oct 28, 2024 · 49531ee · 49531ee
2 parents c37e443 + 9e0978b
commit 49531ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/pkg/statistics/region_collection.go b/pkg/statistics/region_collection.go
@@ -307,6 +307,7 @@ func (r *RegionStatistics) ClearDefunctRegion(regionID uint64) {
 		}
 	}
 	if oldIndex, ok := r.offlineIndex[regionID]; ok {
+		delete(r.offlineIndex, regionID)
 		r.deleteOfflineEntry(oldIndex, regionID)
 	}
 }

diff --git a/pkg/statistics/region_collection_test.go b/pkg/statistics/region_collection_test.go
@@ -129,6 +129,10 @@ func TestRegionStatistics(t *testing.T) {
 	stores[3] = store3
 	regionStats.Observe(region1, stores)
 	re.Empty(regionStats.stats[OfflinePeer])
+
+	regionStats.ClearDefunctRegion(1)
+	re.Equal(1, len(regionStats.index))
+	re.Equal(1, len(regionStats.offlineIndex))
 }
 
 func TestRegionStatisticsWithPlacementRule(t *testing.T) {
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     	}
     	if oldIndex, ok := r.offlineIndex[regionID]; ok {
+    		delete(r.offlineIndex, regionID)
     		r.deleteOfflineEntry(oldIndex, regionID)
     	}
     }
@@ Expand Down @@