osd: Add OSD_BACKFILL_PRIORITY_FORCED with lower priority

than OSD_RECOVERY_PRIORITY_FORCED

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit d088ffb09f46c6207cfedd2cdab9f074197af4bb)

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index b8b87d21a0d14525f8138c48764515d7fbf704e1..4613e8f89f348a6f2de5b49f8066bffabc1ea903 100644 (file)
--- 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 c9b5392d9b2dc411b99692093486953366e43553..ba323ba9918b319646d001f0d330f9dd197a5761 100644 (file)
--- 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