merge master

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

pkg/mcs/resource_manager/server/resource_group.go

@@ -172,60 +172,25 @@ func FromProtoResourceGroup(group *rmpb.ResourceGroup) *ResourceGroup {
 	return rg
 }
 
-<<<<<<< HEAD
-// UpdateRRU updates the RRU of the resource group.
-func (rg *ResourceGroup) UpdateRRU(now time.Time) {
-	rg.Lock()
-	defer rg.Unlock()
-	if rg.RUSettings != nil {
-		rg.RUSettings.RRU.update(now)
-	}
-}
-
-// UpdateWRU updates the WRU of the resource group.
-func (rg *ResourceGroup) UpdateWRU(now time.Time) {
-	rg.Lock()
-	defer rg.Unlock()
-	if rg.RUSettings != nil {
-		rg.RUSettings.WRU.update(now)
-	}
-}
-
-// RequestRRU requests the RRU of the resource group.
-func (rg *ResourceGroup) RequestRRU(neededTokens float64, targetPeriodMs uint64) *rmpb.GrantedRUTokenBucket {
-=======
 // RequestRRU requests the RRU of the resource group.
 func (rg *ResourceGroup) RequestRRU(now time.Time, neededTokens float64, targetPeriodMs uint64) *rmpb.GrantedRUTokenBucket {
->>>>>>> master
 	rg.Lock()
 	defer rg.Unlock()
 	if rg.RUSettings == nil {
 		return nil
 	}
-<<<<<<< HEAD
-	tb, trickleTimeMs := rg.RUSettings.RRU.request(neededTokens, targetPeriodMs)
-=======
 	tb, trickleTimeMs := rg.RUSettings.RRU.request(now, neededTokens, targetPeriodMs)
->>>>>>> master
 	return &rmpb.GrantedRUTokenBucket{Type: rmpb.RequestUnitType_RRU, GrantedTokens: tb, TrickleTimeMs: trickleTimeMs}
 }
 
 // RequestWRU requests the WRU of the resource group.
-<<<<<<< HEAD
-func (rg *ResourceGroup) RequestWRU(neededTokens float64, targetPeriodMs uint64) *rmpb.GrantedRUTokenBucket {
-=======
 func (rg *ResourceGroup) RequestWRU(now time.Time, neededTokens float64, targetPeriodMs uint64) *rmpb.GrantedRUTokenBucket {
->>>>>>> master
 	rg.Lock()
 	defer rg.Unlock()
 	if rg.RUSettings == nil {
 		return nil
 	}
-<<<<<<< HEAD
-	tb, trickleTimeMs := rg.RUSettings.WRU.request(neededTokens, targetPeriodMs)
-=======
 	tb, trickleTimeMs := rg.RUSettings.WRU.request(now, neededTokens, targetPeriodMs)
->>>>>>> master
 	return &rmpb.GrantedRUTokenBucket{Type: rmpb.RequestUnitType_WRU, GrantedTokens: tb, TrickleTimeMs: trickleTimeMs}
 }