osd: Correction to #6690 change

Reorder sequence so min_size check is right
Remove redundant resize of backfill

Correction to 19cff890eb6083eefdb7b709773313b2c8acbcea

Signed-off-by: David Zafman <david.zafman@inktank.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index ddf5c62df9504d2006c71bca5f7d058bba265b38..1daa150f3077a1c4a43ca9c8aa42d9165dd72873 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1005,6 +1005,10 @@ bool PG::choose_acting(int& newest_update_osd)
     return false;
   }
 
+  // TODO: Add check of osdmap for all OSDs to be able to handle new acting
+  // Determine if compatibility needed
+  bool compat_mode = !cct->_conf->osd_debug_override_acting_compat;
+
   // For now we only backfill 1 at a time as before
   if (!backfill.empty())
     backfill.resize(1);
@@ -1018,15 +1022,7 @@ bool PG::choose_acting(int& newest_update_osd)
     return false;
   }
 
-  // TODO: Add check of osdmap for all OSDs to be able to handle new acting
-  // Determine if compatibility needed
-  bool compat_mode = !cct->_conf->osd_debug_override_acting_compat;
-
   if (compat_mode) {
-    // May not be necessary, but the old mechanism only did one at a time
-    if (!backfill.empty())
-      backfill.resize(1);
-
     want.insert(want.end(), backfill.begin(), backfill.end());
   }