]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/balancer: add cmd to list all plans 25259/head
authorYang Honggang <yanghonggang@umcloud.com>
Fri, 11 May 2018 02:30:09 +0000 (02:30 +0000)
committerKonstantin Shalygin <k0ste@k0ste.ru>
Mon, 26 Nov 2018 08:42:47 +0000 (15:42 +0700)
Signed-off-by: Yang Honggang <yanghonggang@umcloud.com>
(cherry picked from commit 99245c69829c53dab6790da5502420c7183c6bcd)

doc/mgr/balancer.rst
src/pybind/mgr/balancer/module.py

index 191c45593be8a23d8287a307d0d4d693958a4d26..f3cb86f7ddd4a65901b7ffd0cab02ed77c988831 100644 (file)
@@ -129,6 +129,10 @@ The name is provided by the user and can be any useful identifying string.  The
 
   ceph balancer show <plan-name>
 
+All plans can be shown with::
+
+  ceph balancer ls
+
 Old plans can be discarded with::
 
   ceph balancer rm <plan-name>
index 529ee012d6124b9f1333982ad2e8ed1b49fe2423..20a0eb1e62ac835d975d543e6834089266d73461 100644 (file)
@@ -258,6 +258,11 @@ class Module(MgrModule):
             "desc": "Show an optimization plan",
             "perm": "r",
         },
+        {
+            "cmd": "balancer ls",
+            "desc": "List all plans",
+            "perm": "r",
+        },
         {
             "cmd": "balancer execute name=plan,type=CephString",
             "desc": "Execute an optimization plan",
@@ -344,6 +349,8 @@ class Module(MgrModule):
         elif command['prefix'] == 'balancer reset':
             self.plans = {}
             return (0, '', '')
+        elif command['prefix'] == 'balancer ls':
+            return (0, json.dumps([p for p in self.plans], indent=4), '')
         elif command['prefix'] == 'balancer dump':
             plan = self.plans.get(command['plan'])
             if not plan: