fix

Signed-off-by: nolouch <[email protected]>
tikv · Jul 4, 2024 · 0b3d43f · 0b3d43f
1 parent 9375fc7
commit 0b3d43f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pkg/mcs/resourcemanager/server/config.go b/pkg/mcs/resourcemanager/server/config.go
@@ -212,11 +212,11 @@ func (c *Config) Parse(flagSet *pflag.FlagSet) error {
 	configutil.AdjustCommandLineString(flagSet, &c.ListenAddr, "listen-addr")
 	configutil.AdjustCommandLineString(flagSet, &c.AdvertiseListenAddr, "advertise-listen-addr")
 
-	return c.Adjust(meta, false)
+	return c.Adjust(meta)
 }
 
 // Adjust is used to adjust the resource manager configurations.
-func (c *Config) Adjust(meta *toml.MetaData, reloading bool) error {
+func (c *Config) Adjust(meta *toml.MetaData) error {
 	configMetaData := configutil.NewConfigMetadata(meta)
 	if err := configMetaData.CheckUndecoded(); err != nil {
 		c.WarningMsgs = append(c.WarningMsgs, err.Error())

diff --git a/tools/pd-ctl/tests/resourcemanager/resource_manager_command_test.go b/tools/pd-ctl/tests/resourcemanager/resource_manager_command_test.go
@@ -58,7 +58,7 @@ func (s *testResourceManagerSuite) TearDownSuite() {
 
 func (s *testResourceManagerSuite) TestConfigController() {
 	re := s.Require()
-	expectCfg := server.ControllerConfig{}
+	expectCfg := server.Config{}
 	expectCfg.Adjust(nil)
 	// Show controller config
 	checkShow := func() {
@@ -69,7 +69,7 @@ func (s *testResourceManagerSuite) TestConfigController() {
 		actualCfg := server.ControllerConfig{}
 		err = json.Unmarshal(output, &actualCfg)
 		re.NoError(err, string(output))
-		re.Equal(expectCfg, actualCfg)
+		re.Equal(expectCfg.Controller, actualCfg)
 	}
 
 	// Check default config
@@ -80,20 +80,20 @@ func (s *testResourceManagerSuite) TestConfigController() {
 	output, err := tests.ExecuteCommand(ctl.GetRootCmd(), args...)
 	re.NoError(err)
 	re.Contains(string(output), "Success!")
-	expectCfg.LTBMaxWaitDuration = typeutil.Duration{Duration: 1 * time.Hour}
+	expectCfg.Controller.LTBMaxWaitDuration = typeutil.Duration{Duration: 1 * time.Hour}
 	checkShow()
 
 	args = []string{"-u", s.pdAddr, "resource-manager", "config", "controller", "set", "enable-controller-trace-log", "true"}
 	output, err = tests.ExecuteCommand(ctl.GetRootCmd(), args...)
 	re.NoError(err)
 	re.Contains(string(output), "Success!")
-	expectCfg.EnableControllerTraceLog = true
+	expectCfg.Controller.EnableControllerTraceLog = true
 	checkShow()
 
 	args = []string{"-u", s.pdAddr, "resource-manager", "config", "controller", "set", "write-base-cost", "2"}
 	output, err = tests.ExecuteCommand(ctl.GetRootCmd(), args...)
 	re.NoError(err)
 	re.Contains(string(output), "Success!")
-	expectCfg.RequestUnit.WriteBaseCost = 2
+	expectCfg.Controller.RequestUnit.WriteBaseCost = 2
 	checkShow()
 }