From: Nizamudeen A <nia@redhat.com>
Date: Thu, 27 Apr 2023 11:24:24 +0000 (+0530)
Subject: mgr/dashboard: fix the rbd mirroring configure check
X-Git-Tag: v17.2.7~427^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F51325%2Fhead;p=ceph.git

mgr/dashboard: fix the rbd mirroring configure check

In one-way mirroring, the condition we are checking now for configuring
the mirroring will fail because only one cluster needs to have the
mirror daemon present. Thus even if mirroring is successfuly happening
the page won't load. For now relaxing the rule until we find a better
api call to check for the status

Fixes: https://tracker.ceph.com/issues/59573
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 09de6be991c4240065bf5774e798b3d274443cff)
---

diff --git a/src/pybind/mgr/dashboard/controllers/rbd_mirroring.py b/src/pybind/mgr/dashboard/controllers/rbd_mirroring.py
index 65eb0b56e8ba..2ee53fc1ad46 100644
--- a/src/pybind/mgr/dashboard/controllers/rbd_mirroring.py
+++ b/src/pybind/mgr/dashboard/controllers/rbd_mirroring.py
@@ -649,7 +649,7 @@ class RbdMirroringStatus(BaseController):
         # using dashboard.
         if not orch_status['available']:
             return status
-        if not CephService.get_service_list('rbd-mirror') or not CephService.get_pool_list('rbd'):
+        if not CephService.get_service_list('rbd-mirror') and not CephService.get_pool_list('rbd'):
             status['available'] = False
             status['message'] = 'RBD mirroring is not configured'  # type: ignore
         return status