From b49772cad9524d9d81c1071643a1b8259f23b35a Mon Sep 17 00:00:00 2001 From: David Zafman Date: Thu, 31 Jan 2019 23:04:03 -0800 Subject: [PATCH] osd: Add OSD_BACKFILL_PRIORITY_FORCED with lower priority than OSD_RECOVERY_PRIORITY_FORCED Signed-off-by: David Zafman (cherry picked from commit d088ffb09f46c6207cfedd2cdab9f074197af4bb) --- src/osd/PG.cc | 2 +- src/osd/osd_types.h | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index b8b87d21a0d14..4613e8f89f348 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -2392,7 +2392,7 @@ unsigned PG::get_backfill_priority() // a higher value -> a higher priority int ret = OSD_BACKFILL_PRIORITY_BASE; if (state & PG_STATE_FORCED_BACKFILL) { - ret = OSD_RECOVERY_PRIORITY_FORCED; + ret = OSD_BACKFILL_PRIORITY_FORCED; } else { if (acting.size() < pool.info.min_size) { // inactive: no. of replicas < min_size, highest priority since it blocks IO diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index c9b5392d9b2dc..ba323ba9918b3 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -82,9 +82,12 @@ #define OSD_BACKFILL_INACTIVE_PRIORITY_BASE 220 /// max manually/automatically set recovery priority for MBackfillReserve -#define OSD_RECOVERY_PRIORITY_MAX 254 +#define OSD_RECOVERY_PRIORITY_MAX 253 -/// max recovery priority for MBackfillReserve, only when forced manually +/// backfill priority for MBackfillReserve, when forced manually +#define OSD_BACKFILL_PRIORITY_FORCED 254 + +/// recovery priority for MRecoveryReserve, when forced manually #define OSD_RECOVERY_PRIORITY_FORCED 255 /// priority for pg deletion when osd is not fullish -- 2.39.5