From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 11 Feb 2020 19:16:52 +0000 (-0500)
Subject: rbd: don't treat failure to gather mirror service daemons as a failure
X-Git-Tag: v15.1.1~437^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1cb9e3b56932a1b00850b9cce4c65f8681dcc3cc;p=ceph-ci.git

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 <dillaman@redhat.com>
---

diff --git a/src/tools/rbd/action/MirrorPool.cc b/src/tools/rbd/action/MirrorPool.cc
index d6f649049bf..09458d58788 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();