From 1cb9e3b56932a1b00850b9cce4c65f8681dcc3cc Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 11 Feb 2020 14:16:52 -0500 Subject: [PATCH] rbd: don't treat failure to gather mirror service daemons as a failure The only negative result is that instance ids cannot be cross-referenced to the matching rbd-mirror daemon service. Fixes: https://tracker.ceph.com/issues/44066 Signed-off-by: Jason Dillaman --- src/tools/rbd/action/MirrorPool.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/tools/rbd/action/MirrorPool.cc b/src/tools/rbd/action/MirrorPool.cc index d6f649049bf2e..09458d5878864 100644 --- a/src/tools/rbd/action/MirrorPool.cc +++ b/src/tools/rbd/action/MirrorPool.cc @@ -1458,10 +1458,7 @@ int execute_status(const po::variables_map &vm, } MirrorDaemonServiceInfo daemon_service_info(io_ctx); - r = daemon_service_info.init(); - if (r < 0) { - return r; - } + daemon_service_info.init(); MirrorHealth mirror_daemon_health = daemon_service_info.get_daemon_health(); auto mirror_services = daemon_service_info.get_mirror_services(); -- 2.39.5