Merge pull request ceph#832 from ceph/wip-flush-5855-review

Reviewed-by: Samuel Just <[email protected]> Reviewed-by: David Zafman <[email protected]>
dragonylffly · Nov 23, 2013 · 0b14c15 · 0b14c15
2 parents 740d406 + 86e4fd4
commit 0b14c15
Show file tree

Hide file tree

Showing 8 changed files with 258 additions and 147 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;
@@ -7024,7 +7027,7 @@ void OSD::handle_replica_op(OpRequestRef op)
   T *m = static_cast<T *>(op->get_req());
   assert(m->get_header().type == MSGTYPE);
 
-  dout(10) << __func__ << *m << " epoch " << m->map_epoch << dendl;
+  dout(10) << __func__ << " " << *m << " epoch " << m->map_epoch << dendl;
   if (m->map_epoch < up_epoch) {
     dout(3) << "replica op from before up" << dendl;
     return;