resourcemanager: add settings-only apply path (#10234)

ref #9737

resourcemanager: add settings-only apply path

Signed-off-by: okjiang <819421878@qq.com>

Author: okJiang

pkg/mcs/resourcemanager/server/resource_group.go

@@ -204,7 +204,18 @@ func (rg *ResourceGroup) overrideFillRateAndBurstLimit(fillRate float64, burstLi
 func (rg *ResourceGroup) PatchSettings(metaGroup *rmpb.ResourceGroup) error {
 	rg.Lock()
 	defer rg.Unlock()
+	return rg.patchSettingsLocked(metaGroup, true)
+}
 
+// ApplySettings applies the resource group settings only.
+// It does not patch token delta.
+func (rg *ResourceGroup) ApplySettings(metaGroup *rmpb.ResourceGroup) error {
+	rg.Lock()
+	defer rg.Unlock()
+	return rg.patchSettingsLocked(metaGroup, false)
+}
+
+func (rg *ResourceGroup) patchSettingsLocked(metaGroup *rmpb.ResourceGroup, patchTokens bool) error {
 	if metaGroup.GetMode() != rg.Mode {
 		return errors.New("only support reconfigure in same mode, maybe you should delete and create a new one")
 	}
@@ -220,7 +231,11 @@ func (rg *ResourceGroup) PatchSettings(metaGroup *rmpb.ResourceGroup) error {
 		if settings == nil {
 			return errors.New("invalid resource group settings, RU mode should set RU settings")
 		}
-		rg.RUSettings.RU.patch(settings.GetRU())
+		if patchTokens {
+			rg.RUSettings.RU.patch(settings.GetRU())
+		} else {
+			rg.RUSettings.RU.applySettings(settings.GetRU())
+		}
 	case rmpb.GroupMode_RawMode:
 		panic("no implementation")
 	}

pkg/mcs/resourcemanager/server/resource_group_test.go

@@ -60,3 +60,41 @@ func TestClone(t *testing.T) {
 		require.Equal(t, &rg, rgClone)
 	}
 }
+
+func TestApplySettingsWithoutTokenPatch(t *testing.T) {
+	re := require.New(t)
+	rg := &ResourceGroup{
+		Name: testResourceGroupName,
+		Mode: rmpb.GroupMode_RUMode,
+		RUSettings: &RequestUnitSettings{
+			RU: &GroupTokenBucket{
+				Settings: &rmpb.TokenLimitSettings{
+					FillRate:   100,
+					BurstLimit: 200,
+				},
+				GroupTokenBucketState: GroupTokenBucketState{
+					Tokens:             123.0,
+					overrideFillRate:   -1,
+					overrideBurstLimit: -1,
+				},
+			},
+		},
+	}
+	patch := &rmpb.ResourceGroup{
+		Name: testResourceGroupName,
+		Mode: rmpb.GroupMode_RUMode,
+		RUSettings: &rmpb.GroupRequestUnitSettings{
+			RU: &rmpb.TokenBucket{
+				Settings: &rmpb.TokenLimitSettings{
+					FillRate:   500,
+					BurstLimit: 800,
+				},
+				Tokens: 999.0,
+			},
+		},
+	}
+	re.NoError(rg.ApplySettings(patch))
+	re.Equal(float64(500), rg.getFillRate())
+	re.Equal(int64(800), rg.getBurstLimit())
+	re.Equal(123.0, rg.getRUToken())
+}

pkg/mcs/resourcemanager/server/token_buckets.go

@@ -407,11 +407,12 @@ func (gtb *GroupTokenBucket) getFillRateAndBurstLimit() (fillRate uint64, burstL
 
 // NewGroupTokenBucket returns a new GroupTokenBucket
 func NewGroupTokenBucket(resourceGroupName string, tokenBucket *rmpb.TokenBucket) *GroupTokenBucket {
-	if tokenBucket == nil || tokenBucket.Settings == nil {
+	if tokenBucket == nil || tokenBucket.GetSettings() == nil {
 		return &GroupTokenBucket{}
 	}
+	settings := proto.Clone(tokenBucket.GetSettings()).(*rmpb.TokenLimitSettings)
 	return &GroupTokenBucket{
-		Settings: tokenBucket.GetSettings(),
+		Settings: settings,
 		GroupTokenBucketState: GroupTokenBucketState{
 			Tokens:             tokenBucket.GetTokens(),
 			resourceGroupName:  resourceGroupName,
@@ -438,15 +439,24 @@ func (gtb *GroupTokenBucket) patch(tb *rmpb.TokenBucket) {
 	if tb == nil {
 		return
 	}
-	if setting := proto.Clone(tb.GetSettings()).(*rmpb.TokenLimitSettings); setting != nil {
-		gtb.Settings = setting
-		gtb.settingChanged = true
-	}
+	gtb.applySettings(tb)
 
 	// The settings in token is delta of the last update and now.
 	gtb.Tokens += tb.GetTokens()
 }
 
+// applySettings applies the token bucket settings only without patching token delta.
+func (gtb *GroupTokenBucket) applySettings(tb *rmpb.TokenBucket) {
+	if tb == nil {
+		return
+	}
+	if settings := tb.GetSettings(); settings != nil {
+		setting := proto.Clone(settings).(*rmpb.TokenLimitSettings)
+		gtb.Settings = setting
+		gtb.settingChanged = true
+	}
+}
+
 // init initializes the group token bucket.
 func (gtb *GroupTokenBucket) init(now time.Time) {
 	if gtb.getFillRate() == 0 {