Merge branch 'master' into resourcemanager-availableRUCounter

tikv · Oct 18, 2024 · f805f98 · f805f98
2 parents f3564f2 + 95e00f5
commit f805f98
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/tests/integrations/mcs/scheduling/meta_test.go b/tests/integrations/mcs/scheduling/meta_test.go
@@ -86,7 +86,8 @@ func (suite *metaTestSuite) TestStoreWatch() {
 		)
 	}
 
-	suite.getRaftCluster().RemoveStore(2, false)
+	re.NoError(failpoint.Enable("github.com/tikv/pd/server/cluster/doNotBuryStore", `return(true)`))
+	re.NoError(suite.getRaftCluster().RemoveStore(2, false))
 	testutil.Eventually(re, func() bool {
 		s := cluster.GetStore(2)
 		if s == nil {
@@ -95,6 +96,7 @@ func (suite *metaTestSuite) TestStoreWatch() {
 		return s.GetState() == metapb.StoreState_Offline
 	})
 	re.Len(cluster.GetStores(), 4)
+	re.NoError(failpoint.Disable("github.com/tikv/pd/server/cluster/doNotBuryStore"))
 	testutil.Eventually(re, func() bool {
 		return cluster.GetStore(2).GetState() == metapb.StoreState_Tombstone
 	})