From: Sage Weil <sage@newdream.net>
Date: Fri, 3 Sep 2021 21:46:14 +0000 (-0500)
Subject: os/bluestore: fix/simplify zoned_cleaner thread start error handling
X-Git-Tag: v17.1.0~535^2~46
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3aee16f7a5c07faa3bc778cfe99f103d43f84bfd;p=ceph.git

os/bluestore: fix/simplify zoned_cleaner thread start error handling

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 39c2865b3434..b89651991075 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -7266,22 +7266,17 @@ int BlueStore::_mount()
     }
   });
 
+  r = _deferred_replay();
+  if (r < 0) {
+    return r;
+  }
+
 #ifdef HAVE_LIBZBD
-  using scope_guard_t = scope_guard<std::function<void()>>;
-  std::optional<scope_guard_t> stop_zoned_cleaner;
   if (bdev->is_smr()) {
     _zoned_cleaner_start();
-    stop_zoned_cleaner = scope_guard_t([this] {
-      _zoned_cleaner_stop();
-    });
   }
 #endif
 
-  r = _deferred_replay();
-  if (r < 0) {
-    return r;
-  }
-
   mempool_thread.init();
 
   if ((!per_pool_stat_collection || per_pool_omap != OMAP_PER_PG) &&