From 8d561749e5bfca5194eaf2d2d23b0babb59fb7bd Mon Sep 17 00:00:00 2001 From: Ryan Leung Date: Wed, 13 May 2020 20:24:55 +0800 Subject: [PATCH] pdctl: fix the default config output of shuffle region scheduler (#2416) Signed-off-by: Ryan Leung --- tests/pdctl/scheduler/scheduler_test.go | 2 ++ tools/pd-ctl/pdctl/command/scheduler.go | 15 ++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/pdctl/scheduler/scheduler_test.go b/tests/pdctl/scheduler/scheduler_test.go index 21a4ea4f879..1192c708b20 100644 --- a/tests/pdctl/scheduler/scheduler_test.go +++ b/tests/pdctl/scheduler/scheduler_test.go @@ -231,6 +231,8 @@ func (s *schedulerTestSuite) TestScheduler(c *C) { mustExec([]string{"-u", pdAddr, "scheduler", "config", "shuffle-region-scheduler", "set-roles", "learner"}, nil) mustExec([]string{"-u", pdAddr, "scheduler", "config", "shuffle-region-scheduler", "show-roles"}, &roles) c.Assert(roles, DeepEquals, []string{"learner"}) + mustExec([]string{"-u", pdAddr, "scheduler", "config", "shuffle-region-scheduler"}, &roles) + c.Assert(roles, DeepEquals, []string{"learner"}) // test echo echo := pdctl.GetEcho([]string{"-u", pdAddr, "scheduler", "add", "balance-region-scheduler"}) diff --git a/tools/pd-ctl/pdctl/command/scheduler.go b/tools/pd-ctl/pdctl/command/scheduler.go index dae9c303481..1d13d0aa7c0 100644 --- a/tools/pd-ctl/pdctl/command/scheduler.go +++ b/tools/pd-ctl/pdctl/command/scheduler.go @@ -439,7 +439,7 @@ func NewConfigSchedulerCommand() *cobra.Command { func newConfigHotRegionCommand() *cobra.Command { c := &cobra.Command{ Use: "balance-hot-region-scheduler", - Short: "show evict-leader-scheduler config", + Short: "evict-leader-scheduler config", Run: listSchedulerConfigCommandFunc, } c.AddCommand(&cobra.Command{ @@ -456,7 +456,7 @@ func newConfigHotRegionCommand() *cobra.Command { func newConfigEvictLeaderCommand() *cobra.Command { c := &cobra.Command{ Use: "evict-leader-scheduler", - Short: "show evict-leader-scheduler config", + Short: "evict-leader-scheduler config", Run: listSchedulerConfigCommandFunc, } c.AddCommand(&cobra.Command{ @@ -474,7 +474,7 @@ func newConfigEvictLeaderCommand() *cobra.Command { func newConfigGrantLeaderCommand() *cobra.Command { c := &cobra.Command{ Use: "grant-leader-scheduler", - Short: "show grant-leader-scheduler config", + Short: "grant-leader-scheduler config", Run: listSchedulerConfigCommandFunc, } c.AddCommand(&cobra.Command{ @@ -493,10 +493,11 @@ func newConfigShuffleRegionCommand() *cobra.Command { c := &cobra.Command{ Use: "shuffle-region-scheduler", Short: "shuffle-region-scheduler config", + Run: showShuffleRegionSchedulerRolesCommandFunc, } c.AddCommand(&cobra.Command{ Use: "show-roles", - Short: "show affected roles (leader,follower,learner)", + Short: "show affected roles (leader, follower, learner)", Run: showShuffleRegionSchedulerRolesCommandFunc, }, &cobra.Command{ Use: "set-roles [leader,][follower,][learner]", @@ -594,7 +595,11 @@ func showShuffleRegionSchedulerRolesCommandFunc(cmd *cobra.Command, args []strin cmd.Println(cmd.UsageString()) return } - path := path.Join(schedulerConfigPrefix, cmd.Parent().Name(), "roles") + p := cmd.Name() + if p == "show-roles" { + p = cmd.Parent().Name() + } + path := path.Join(schedulerConfigPrefix, p, "roles") r, err := doRequest(cmd, path, http.MethodGet) if err != nil { cmd.Println(err)