From: David Zafman <david.zafman@inktank.com>
Date: Thu, 2 Jan 2014 23:04:59 +0000 (-0800)
Subject: osd: Correction to #6690 change
X-Git-Tag: v0.77~23^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=830583f8a38306785b5dd7d2283d12bd65d17888;p=ceph.git

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 ddf5c62df950..1daa150f3077 100644
--- 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());
   }