From: Jos Collin <jcollin@redhat.com>
Date: Thu, 13 Jun 2024 06:23:20 +0000 (+0530)
Subject: Merge pull request #57449 from joscollin/wip-65989-squid
X-Git-Tag: v19.1.1~264
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3d895777bb588aa2b84db805070816fe231c0b75;p=ceph.git

Merge pull request #57449 from joscollin/wip-65989-squid

squid: cephfs_mirror: fix crash in update_fs_mirrors()

Reviewed-by: Venky Shankar <vshankar@redhat.com>
---

3d895777bb588aa2b84db805070816fe231c0b75
diff --cc src/tools/cephfs_mirror/FSMirror.h
index aaba1cb9f3a75,efc743a1414c9..b106fdff8b60d
--- 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();