From: Jos Collin <jcollin@redhat.com>
Date: Tue, 25 Jun 2024 10:39:32 +0000 (+0530)
Subject: Merge PR #57451 into wip-jcollin-testing-20240625.103903-reef
X-Git-Tag: testing/wip-jcollin-testing-20240625.103903-reef
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=570cd3094b5bed39a1caaa3ff315a0622e9d03e6;p=ceph-ci.git

Merge PR #57451 into wip-jcollin-testing-20240625.103903-reef

* refs/pull/57451/head:
	cephfs_mirror: check m_instance_watcher and m_mirror_watcher before using them
---

570cd3094b5bed39a1caaa3ff315a0622e9d03e6
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();