]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.in: pass RADOS inst to LibCephFS 18654/head
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 31 Oct 2017 18:55:29 +0000 (11:55 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 31 Oct 2017 19:06:08 +0000 (12:06 -0700)
This avoids multiple instances of the admin socket and other redundancies.

Fixes: http://tracker.ceph.com/issues/21967
Fixes: http://tracker.ceph.com/issues/21406
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
src/pybind/ceph_argparse.py

index b910877e605ff9c28b24aa9e5a12cbcc08a294e4..6582931f0f35e2b2f1b5dbbffe2baf3a27134310 100644 (file)
@@ -1285,9 +1285,7 @@ def send_command(cluster, target=('mon', ''), cmd=None, inbuf=b'', timeout=0,
             except ImportError:
                 raise RuntimeError("CephFS unavailable, have you installed libcephfs?")
 
-            filesystem = LibCephFS(cluster.conf_defaults, cluster.conffile)
-            filesystem.conf_parse_argv(cluster.parsed_args)
-
+            filesystem = LibCephFS(rados_inst=cluster)
             filesystem.init()
             ret, outbuf, outs = \
                 filesystem.mds_command(mds_spec, cmd, inbuf)