From: Patrick Donnelly Date: Tue, 31 Oct 2017 18:55:29 +0000 (-0700) Subject: ceph.in: pass RADOS inst to LibCephFS X-Git-Tag: v12.2.3~150^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d73deb017ce9ad2525a2bda54553c01f386f0b35;p=ceph.git ceph.in: pass RADOS inst to LibCephFS 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 (cherry picked from commit 76a950b2ec473741ed3cffca5c198e8c56f32a1c) --- diff --git a/src/pybind/ceph_argparse.py b/src/pybind/ceph_argparse.py index cc96d7708dc9..3855135df6bd 100644 --- a/src/pybind/ceph_argparse.py +++ b/src/pybind/ceph_argparse.py @@ -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)