osd: Backfill peers should not be included in the acting set

Create actingbackfill in choose_acting() Use first backfill target as previously Add asserts to catch inappropriate use of actingbackfill Use is_acting() in proc_replica_info() because this is before actingbackfill set Remove backfill_targets from stray_set to prevent purge_strays from removing collection Can't check is_replica() anymore for backfill operations since a backfill isn't a replica due to acting set change. fixes: ceph#5855 Signed-off-by: David Zafman <[email protected]>
dragonylffly · Nov 19, 2013 · 86e4fd4 · 86e4fd4
1 parent 19dbf7b
commit 86e4fd4
Show file tree

Hide file tree

Showing 6 changed files with 178 additions and 99 deletions.
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
@@ -6011,8 +6011,11 @@ void OSD::dispatch_context_transaction(PG::RecoveryCtx &ctx, PG *pg)
 bool OSD::compat_must_dispatch_immediately(PG *pg)
 {
   assert(pg->is_locked());
-  for (vector<int>::iterator i = pg->acting.begin();
-       i != pg->acting.end();
+  vector<int> *tmpacting = &pg->acting;
+  if (pg->actingbackfill.size() > 0)
+    tmpacting = &pg->actingbackfill;
+  for (vector<int>::iterator i = tmpacting->begin();
+       i != tmpacting->end();
        ++i) {
     if (*i == whoami)
       continue;