Merge branch 'release-7.5' into cherry-pick-7722-to-release-7.5

tikv · Apr 3, 2024 · a410d05 · a410d05
2 parents 1fbab5c + dee209b
commit a410d05
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/client/resource_group/controller/controller.go b/client/resource_group/controller/controller.go
@@ -563,7 +563,6 @@ func (c *ResourceGroupsController) IsBackgroundRequest(ctx context.Context,
 	resourceGroupName, requestResource string) bool {
 	gc, err := c.tryGetResourceGroup(ctx, resourceGroupName)
 	if err != nil {
-		failedRequestCounter.WithLabelValues(resourceGroupName).Inc()
 		return false
 	}
 
@@ -576,7 +575,6 @@ func (c *ResourceGroupsController) checkBackgroundSettings(ctx context.Context,
 		resourceGroupName := "default"
 		gc, err := c.tryGetResourceGroup(ctx, resourceGroupName)
 		if err != nil {
-			failedRequestCounter.WithLabelValues(resourceGroupName).Inc()
 			return false
 		}
 		bg = gc.getMeta().BackgroundSettings

diff --git a/tests/integrations/mcs/resourcemanager/resource_manager_test.go b/tests/integrations/mcs/resourcemanager/resource_manager_test.go
@@ -1271,6 +1271,7 @@ func (suite *resourceManagerClientTestSuite) TestCheckBackgroundJobs() {
 	re.False(c.IsBackgroundRequest(suite.ctx, resourceGroupName, "internal_lightning"))
 	re.False(c.IsBackgroundRequest(suite.ctx, resourceGroupName, "internal_ddl"))
 	re.False(c.IsBackgroundRequest(suite.ctx, resourceGroupName, ""))
+	re.False(c.IsBackgroundRequest(suite.ctx, "none", "none"))
 
 	resourceGroupName = enableBackgroundGroup(true)
 	re.True(c.IsBackgroundRequest(suite.ctx, resourceGroupName, "internal_br"))