Merge pull request #6704 from liewegas/wip-up-thru

mon: block 'ceph osd pg-temp ...' if pg_temp update is already pending Reviewed-by: Joao Eduardo Luis <joao@suse.de>
ceph · Nov 26, 2015 · d0690be · d0690be
2 parents 1e9aeb5 + 3680dc3
commit d0690be
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
@@ -6179,6 +6179,11 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
       err = -ENOENT;
       goto reply;
     }
+    if (pending_inc.new_pg_temp.count(pgid)) {
+      dout(10) << __func__ << " waiting for pending update on " << pgid << dendl;
+      wait_for_finished_proposal(op, new C_RetryMessage(this, op));
+      return true;
+    }
 
     vector<string> id_vec;
     vector<int32_t> new_pg_temp;