Merge pull request ceph#1817 from ceph/wip-osdmon-pa-wait

OSDMonitor: set next commit in mon primary-affinity reply Reviewed-by: Sage Weil <[email protected]>
devicenull · May 16, 2014 · 7a15381 · 7a15381
2 parents a877d12 + a78b14e
commit 7a15381
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
@@ -4493,7 +4493,8 @@ bool OSDMonitor::prepare_command_impl(MMonCommand *m,
       pending_inc.new_primary_affinity[id] = ww;
       ss << "set osd." << id << " primary-affinity to " << w << " (" << ios::hex << ww << ios::dec << ")";
       getline(ss, rs);
-      wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, get_last_committed()));
+      wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs,
+                                                get_last_committed() + 1));
       return true;
     }
   } else if (prefix == "osd reweight") {