From: Xiubo Li <xiubli@redhat.com>
Date: Thu, 4 Jul 2024 03:49:24 +0000 (+0800)
Subject: Merge pull request #57451 from joscollin/wip-65990-reef
X-Git-Tag: testing/wip-jcollin-testing-20240711.125835-reef~21
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1fdc054da4e28d5d3c57c5a28c1f55436673019e;p=ceph-ci.git

Merge pull request #57451 from joscollin/wip-65990-reef

reef: cephfs_mirror: fix crash in update_fs_mirrors()
---

1fdc054da4e28d5d3c57c5a28c1f55436673019e
diff --cc src/tools/cephfs_mirror/FSMirror.h
index aaba1cb9f3a,efc743a1414..b106fdff8b6
--- a/src/tools/cephfs_mirror/FSMirror.h
+++ b/src/tools/cephfs_mirror/FSMirror.h
@@@ -47,12 -47,17 +47,17 @@@ public
  
    bool is_failed() {
      std::scoped_lock locker(m_lock);
-     return m_init_failed ||
-            m_instance_watcher->is_failed() ||
-            m_mirror_watcher->is_failed();
+     bool failed = m_init_failed;
+     if (m_instance_watcher) {
+       failed |= m_instance_watcher->is_failed();
+     }
+     if (m_mirror_watcher) {
+       failed |= m_mirror_watcher->is_failed();
+     }
+     return failed;
    }
  
 -  utime_t get_failed_ts() {
 +  monotime get_failed_ts() {
      std::scoped_lock locker(m_lock);
      if (m_instance_watcher) {
        return m_instance_watcher->get_failed_ts();