Skip to content

Commit

Permalink
Merge pull request #9252 from vumrao/wip-vumrao-15983
Browse files Browse the repository at this point in the history
mon: change osdmap flags set and unset messages

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
  • Loading branch information
tchaikov committed Jul 11, 2016
2 parents e15c8ef + 28c35fb commit 35ce55d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/mon/OSDMonitor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4872,7 +4872,7 @@ bool OSDMonitor::prepare_set_flag(MonOpRequestRef op, int flag)
if (pending_inc.new_flags < 0)
pending_inc.new_flags = osdmap.get_flags();
pending_inc.new_flags |= flag;
ss << "set " << OSDMap::get_flag_string(flag);
ss << OSDMap::get_flag_string(flag) << " is set";
wait_for_finished_proposal(op, new Monitor::C_Command(mon, op, 0, ss.str(),
get_last_committed() + 1));
return true;
Expand All @@ -4885,7 +4885,7 @@ bool OSDMonitor::prepare_unset_flag(MonOpRequestRef op, int flag)
if (pending_inc.new_flags < 0)
pending_inc.new_flags = osdmap.get_flags();
pending_inc.new_flags &= ~flag;
ss << "unset " << OSDMap::get_flag_string(flag);
ss << OSDMap::get_flag_string(flag) << " is unset";
wait_for_finished_proposal(op, new Monitor::C_Command(mon, op, 0, ss.str(),
get_last_committed() + 1));
return true;
Expand Down

0 comments on commit 35ce55d

Please sign in to comment.