From a78b14ec1769ef37bef82bfda6faabb581b4cd7d Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Fri, 16 May 2014 19:03:13 +0400 Subject: [PATCH] OSDMonitor: set next commit in mon primary-affinity reply 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 --- src/mon/OSDMonitor.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 6785f904d5e..63b5de88f0e 100644 --- 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") { -- 2.47.3