]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
ceph_manager: drop -- before --format=json arg
authorSage Weil <sage@inktank.com>
Sat, 8 Jun 2013 04:58:41 +0000 (21:58 -0700)
committerSage Weil <sage@inktank.com>
Sat, 8 Jun 2013 04:58:41 +0000 (21:58 -0700)
Signed-off-by: Sage Weil <sage@inktank.com>
teuthology/task/ceph_manager.py

index c5c3723fc2e638ee89f7097d50773d1c687a1b16..974a18ddec3ffa4dc4e75c71652e2dfb57c289ee 100644 (file)
@@ -402,7 +402,7 @@ class CephManager:
         """
         get number for pool (e.g., data -> 2)
         """
-        out = self.raw_cluster_cmd('--', 'osd','dump','--format=json')
+        out = self.raw_cluster_cmd('osd','dump','--format=json')
         j = json.loads('\n'.join(out.split('\n')[1:]))
         for i in j['pools']:
             if i['pool_name'] == pool:
@@ -586,7 +586,7 @@ class CephManager:
         return r
 
     def get_pg_stats(self):
-        out = self.raw_cluster_cmd('--', 'pg','dump','--format=json')
+        out = self.raw_cluster_cmd('pg','dump','--format=json')
         j = json.loads('\n'.join(out.split('\n')[1:]))
         return j['pg_stats']
 
@@ -636,12 +636,12 @@ class CephManager:
         return None
 
     def get_osd_dump(self):
-        out = self.raw_cluster_cmd('--', 'osd','dump','--format=json')
+        out = self.raw_cluster_cmd('osd','dump','--format=json')
         j = json.loads('\n'.join(out.split('\n')[1:]))
         return j['osds']
 
     def get_stuck_pgs(self, type_, threshold):
-        out = self.raw_cluster_cmd('--', 'pg','dump_stuck', type_,
+        out = self.raw_cluster_cmd('pg','dump_stuck', type_,
                                    '--format=json', '-t', str(threshold))
         return json.loads('\n'.join(out.split('\n')[1:]))