From 7abb015d54c800abccbc5667c9ffff3b7b5ee8be Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 15 Sep 2017 11:24:45 -0400 Subject: [PATCH] osd/PG: add is_forced_recovery_or_backfill() Signed-off-by: Sage Weil --- src/osd/OSD.h | 2 +- src/osd/PG.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 6fcede1e7fc..4d783461b43 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 606b32dfc71..9300b927fbb 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); -- 2.39.5