address comment

Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

pkg/mcs/resource_manager/server/grpc_service.go

@@ -156,15 +156,15 @@ func (s *Service) AcquireTokenBuckets(stream rmpb.ResourceManager_AcquireTokenBu
 			}
 			switch rg.Mode {
 			case rmpb.GroupMode_RUMode:
+				var tokens *rmpb.GrantedRUTokenBucket
 				for _, re := range req.GetRuItems().GetRequestRU() {
 					switch re.Type {
 					case rmpb.RequestUnitType_RRU:
-						tokens := rg.RequestRRU(now, re.Value, targetPeriodMs)
-						resp.GrantedRUTokens = append(resp.GrantedRUTokens, tokens)
+						tokens = rg.RequestRRU(now, re.Value, targetPeriodMs)
 					case rmpb.RequestUnitType_WRU:
-						tokens := rg.RequestWRU(now, re.Value, targetPeriodMs)
-						resp.GrantedRUTokens = append(resp.GrantedRUTokens, tokens)
+						tokens = rg.RequestWRU(now, re.Value, targetPeriodMs)
 					}
+					resp.GrantedRUTokens = append(resp.GrantedRUTokens, tokens)
 				}
 			case rmpb.GroupMode_RawMode:
 				log.Warn("not supports the resource type", zap.String("resource-group", req.ResourceGroupName), zap.String("mode", rmpb.GroupMode_name[int32(rmpb.GroupMode_RawMode)]))

pkg/mcs/resource_manager/server/token_bukets.go

@@ -33,15 +33,15 @@ const (
 )
 
 // GroupTokenBucket is a token bucket for a resource group.
-// TODO: statistics Consumption
+// TODO: statistics consumption @JmPotato
 type GroupTokenBucket struct {
 	*rmpb.TokenBucket `json:"token_bucket,omitempty"`
 	// MaxTokens limits the number of tokens that can be accumulated
 	MaxTokens float64 `json:"max_tokens,omitempty"`
 
-	Consumption *rmpb.TokenBucketsRequest `json:"consumption,omitempty"`
-	LastUpdate  *time.Time                `json:"last_update,omitempty"`
-	Initialized bool                      `json:"initialized"`
+	Consumption *rmpb.Consumption `json:"consumption,omitempty"`
+	LastUpdate  *time.Time        `json:"last_update,omitempty"`
+	Initialized bool              `json:"initialized"`
 }
 
 // NewGroupTokenBucket returns a new GroupTokenBucket