From: Abutalib Aghayev <agayev@psu.edu>
Date: Tue, 22 Jun 2021 19:00:54 +0000 (-0400)
Subject: os/bluestore: Resume cleaning after an unclean shutdown.
X-Git-Tag: v17.1.0~1525^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2459a3eeecf04ce19f3676b2a434001af6bbbc67;p=ceph.git

os/bluestore: Resume cleaning after an unclean shutdown.

Signed-off-by: Abutalib Aghayev <agayev@psu.edu>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index e60bb5523a8e..7520b5de0ea7 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -12376,6 +12376,19 @@ void BlueStore::_kv_finalize_thread()
 void BlueStore::_zoned_cleaner_start() {
   dout(10) << __func__ << dendl;
 
+  auto f = dynamic_cast<ZonedFreelistManager*>(fm);
+  ceph_assert(f);
+
+  auto zones_to_clean = f->get_cleaning_in_progress_zones(db);
+  if (!zones_to_clean.empty()) {
+    dout(10) << __func__ << " resuming cleaning after unclean shutdown." << dendl;
+    for (auto zone_num : zones_to_clean) {
+      _zoned_clean_zone(zone_num);
+    }
+    bdev->reset_zones(zones_to_clean);
+    f->mark_zones_to_clean_free(zones_to_clean, db);
+  }
+
   zoned_cleaner_thread.create("bstore_zcleaner");
 }