osd/PG: add is_forced_recovery_or_backfill()

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 6fcede1e7fccebda02ddb2e8a493cb3ce9e612a6..4d783461b43a5063b0ca2cfcd60650f477ac4e62 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -944,7 +944,7 @@ public:
   void queue_for_recovery(PG *pg) {
     Mutex::Locker l(recovery_lock);
 
-    if (pg->get_state() & (PG_STATE_FORCED_RECOVERY | PG_STATE_FORCED_BACKFILL)) {
+    if (pg->is_forced_recovery_or_backfill()) {
       awaiting_throttle.push_front(make_pair(pg->get_osdmap()->get_epoch(), pg));
     } else {
       awaiting_throttle.push_back(make_pair(pg->get_osdmap()->get_epoch(), pg));

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 606b32dfc71972eda3ac79ca61e7dbec01201a13..9300b927fbb76bb509722a4635e2fc3a9b4a29a1 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -354,6 +354,9 @@ public:
   void reg_next_scrub();
   void unreg_next_scrub();
 
+  bool is_forced_recovery_or_backfill() const {
+    return get_state() & (PG_STATE_FORCED_RECOVERY | PG_STATE_FORCED_BACKFILL);
+  }
   void set_force_recovery(bool b);
   void set_force_backfill(bool b);