From 1e617944411ac184389065295331559fbf325ab0 Mon Sep 17 00:00:00 2001
From: guo-shaoge <shaoge1994@163.com>
Date: Tue, 19 Sep 2023 22:02:31 +0800
Subject: [PATCH] Revert "revert rg name req code"

This reverts commit 5c1baca478d7355f46e309e22f604ae2e9b7997b.
---
 executor/internal/mpp/local_mpp_coordinator.go | 1 +
 kv/mpp.go                                      | 1 +
 store/copr/batch_coprocessor.go                | 3 +++
 store/copr/mpp.go                              | 1 +
 4 files changed, 6 insertions(+)

diff --git a/executor/internal/mpp/local_mpp_coordinator.go b/executor/internal/mpp/local_mpp_coordinator.go
index 8251a732b313b..84f969d5b4f5b 100644
--- a/executor/internal/mpp/local_mpp_coordinator.go
+++ b/executor/internal/mpp/local_mpp_coordinator.go
@@ -229,6 +229,7 @@ func (c *localMppCoordinator) appendMPPDispatchReq(pf *plannercore.Fragment) err
 			CoordinatorAddress:     c.coordinatorAddr,
 			ReportExecutionSummary: c.reportExecutionInfo,
 			State:                  kv.MppTaskReady,
+			ResourceGroupName:      c.sessionCtx.GetSessionVars().ResourceGroupName,
 		}
 		c.reqMap[req.ID] = &mppRequestReport{mppReq: req, receivedReport: false, errMsg: "", executionSummaries: nil}
 		c.mppReqs = append(c.mppReqs, req)
diff --git a/kv/mpp.go b/kv/mpp.go
index 214528086365d..402309fd61619 100644
--- a/kv/mpp.go
+++ b/kv/mpp.go
@@ -154,6 +154,7 @@ type MPPDispatchRequest struct {
 	CoordinatorAddress     string
 	ReportExecutionSummary bool
 	State                  MppTaskStates
+	ResourceGroupName      string
 }
 
 // CancelMPPTasksParam represents parameter for MPPClient's CancelMPPTasks
diff --git a/store/copr/batch_coprocessor.go b/store/copr/batch_coprocessor.go
index 02a2bd77784eb..1ae43c14de221 100644
--- a/store/copr/batch_coprocessor.go
+++ b/store/copr/batch_coprocessor.go
@@ -1276,6 +1276,9 @@ func (b *batchCopIterator) handleTaskOnce(ctx context.Context, bo *backoff.Backo
 		RecordTimeStat: true,
 		RecordScanStat: true,
 		TaskId:         b.req.TaskID,
+		ResourceControlContext: &kvrpcpb.ResourceControlContext{
+			ResourceGroupName: b.req.ResourceGroupName,
+		},
 	})
 	if b.req.ResourceGroupTagger != nil {
 		b.req.ResourceGroupTagger(req)
diff --git a/store/copr/mpp.go b/store/copr/mpp.go
index 945252a130340..513a115168839 100644
--- a/store/copr/mpp.go
+++ b/store/copr/mpp.go
@@ -108,6 +108,7 @@ func (c *MPPClient) DispatchMPPTask(param kv.DispatchMPPTaskParam) (resp *mpp.Di
 		CoordinatorAddress:     req.CoordinatorAddress,
 		ReportExecutionSummary: req.ReportExecutionSummary,
 		MppVersion:             req.MppVersion.ToInt64(),
+		ResourceGroupName:      req.ResourceGroupName,
 	}
 
 	mppReq := &mpp.DispatchTaskRequest{