osd: Add OSD_BACKFILL_PRIORITY_FORCED with lower priority

than OSD_RECOVERY_PRIORITY_FORCED

Signed-off-by: David Zafman <dzafman@redhat.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 170d772ce285af6071d85311814088586be0bc26..0ea49cd8147a37420d96f4f60520dfd256a21cb7 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2467,7 +2467,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 41a9f62a9cbac0f581f61a532448d83fd5a240a5..77def16ee502d2a15cc06a1d0af9e360ead792db 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -83,9 +83,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