fixup! crimson/os/seastore/EPM/BackgroundProcess: add promote and demote process

diff --git a/src/crimson/os/seastore/extent_placement_manager.cc b/src/crimson/os/seastore/extent_placement_manager.cc
index 74b388228281dc0526454e0798b42440340ba73c..c143d188d4ca5998074bf620b3f5fc75715d86d5 100644 (file)
--- a/src/crimson/os/seastore/extent_placement_manager.cc
+++ b/src/crimson/os/seastore/extent_placement_manager.cc
@@ -1095,10 +1095,7 @@ ExtentPlacementManager::BackgroundProcess::do_background_cycle()
     }
 
     bool proceed_demote = false;
-    if (has_cold_tier() &&
-        logical_bucket->could_demote() &&
-        (eviction_state.is_fast_mode() ||
-         logical_bucket->should_demote())) {
+    if (demote_should_run()) {
       proceed_demote = true;
     }
     INFO("proceed_demote: {}, could_demote: {}, fast_mode: {}, should_demote {}",

diff --git a/src/crimson/os/seastore/extent_placement_manager.h b/src/crimson/os/seastore/extent_placement_manager.h
index 3f901f1b41545fb7bb8add3b96cddaade7450a72..be22735b904914d27e6a565c03e53ba497ca3bdf 100644 (file)
--- a/src/crimson/os/seastore/extent_placement_manager.h
+++ b/src/crimson/os/seastore/extent_placement_manager.h
@@ -1172,7 +1172,8 @@ private:
       maybe_update_eviction_mode();
       return main_cleaner_should_run()
         || cold_cleaner_should_run()
-        || trimmer->should_trim();
+        || trimmer->should_trim()
+        || demote_should_run();
     }
 
     bool main_cleaner_should_fast_evict() const {
@@ -1194,6 +1195,13 @@ private:
         cold_cleaner->should_clean_space();
     }
 
+    bool demote_should_run() const {
+      return has_cold_tier() &&
+        logical_bucket->could_demote() &&
+        (eviction_state.is_fast_mode() ||
+         logical_bucket->should_demote());
+    }
+
     bool should_block_io() const {
       assert(is_ready());
       return trimmer->should_block_io_on_trim() ||