From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Sep 2017 15:24:45 +0000 (-0400)
Subject: osd/PG: add is_forced_recovery_or_backfill()
X-Git-Tag: v13.0.1~634^2~55
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7abb015d54c800abccbc5667c9ffff3b7b5ee8be;p=ceph.git

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 6fcede1e7fcc..4d783461b43a 100644
--- 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 606b32dfc719..9300b927fbb7 100644
--- 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);