From e12f85e1335f7f297636e1f184bb412e2a978c14 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 31 Oct 2017 11:55:29 -0700 Subject: [PATCH] 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) --- src/pybind/ceph_argparse.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pybind/ceph_argparse.py b/src/pybind/ceph_argparse.py index 57a5390c77b74..d8a9f4bd5e039 100644 --- a/src/pybind/ceph_argparse.py +++ b/src/pybind/ceph_argparse.py @@ -1252,9 +1252,7 @@ def send_command(cluster, target=('mon', ''), cmd=None, inbuf='', 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) -- 2.39.5