]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
OSDMonitor: set next commit in mon primary-affinity reply 1817/head
authorIlya Dryomov <ilya.dryomov@inktank.com>
Fri, 16 May 2014 15:03:13 +0000 (19:03 +0400)
committerIlya Dryomov <ilya.dryomov@inktank.com>
Fri, 16 May 2014 16:25:36 +0000 (20:25 +0400)
Commit 8c5c55c8b47e ("mon: set next commit in mon command replies")
fixed MMonCommand replies to include the right version, but the
primary-affinity handler was authored before that.  Fix it.

Backport: firefly
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
src/mon/OSDMonitor.cc

index 6785f904d5eb78a35378ba5b5cfbd826c4ca377e..63b5de88f0e7b09107c66ea2d235028747b2306b 100644 (file)
@@ -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") {