]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.in: pass RADOS inst to LibCephFS 18829/head 18831/head
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 31 Oct 2017 18:55:29 +0000 (11:55 -0700)
committerShinobu Kinjo <shinobu@redhat.com>
Thu, 9 Nov 2017 05:17:39 +0000 (00:17 -0500)
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>
(cherry picked from commit 76a950b2ec473741ed3cffca5c198e8c56f32a1c)

src/pybind/ceph_argparse.py

index cc96d7708dc95668453e0d3374a333ca751f9b8f..3855135df6bd6b3c1aa808bb4fc68eb7e2dcb03d 100644 (file)
@@ -1284,9 +1284,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)