Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mon/MonmapMonitor: use __func__ instead of hard code function name #16037

Merged
merged 1 commit into from
Jun 30, 2017
Merged

mon/MonmapMonitor: use __func__ instead of hard code function name #16037

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/mon/MonmapMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static ostream& _prefix(std::ostream *_dout, Monitor *mon) {

void MonmapMonitor::create_initial()
{
dout(10) << "create_initial using current monmap" << dendl;
dout(10) << __func__ << " using current monmap" << dendl;
pending_map = *mon->monmap;
pending_map.epoch = 1;

Expand Down Expand Up @@ -70,7 +70,7 @@ void MonmapMonitor::update_from_paxos(bool *need_bootstrap)
assert(ret == 0);
assert(monmap_bl.length());

dout(10) << "update_from_paxos got " << version << dendl;
dout(10) << __func__ << " got " << version << dendl;
mon->monmap->decode(monmap_bl);

if (mon->store->exists("mkfs", "monmap")) {
Expand All @@ -87,12 +87,12 @@ void MonmapMonitor::create_pending()
pending_map = *mon->monmap;
pending_map.epoch++;
pending_map.last_changed = ceph_clock_now();
dout(10) << "create_pending monmap epoch " << pending_map.epoch << dendl;
dout(10) << __func__ << " monmap epoch " << pending_map.epoch << dendl;
}

void MonmapMonitor::encode_pending(MonitorDBStore::TransactionRef t)
{
dout(10) << "encode_pending epoch " << pending_map.epoch << dendl;
dout(10) << __func__ << " epoch " << pending_map.epoch << dendl;

assert(mon->monmap->epoch + 1 == pending_map.epoch ||
pending_map.epoch == 1); // special case mkfs!
Expand Down Expand Up @@ -397,7 +397,7 @@ bool MonmapMonitor::preprocess_command(MonOpRequestRef op)
bool MonmapMonitor::prepare_update(MonOpRequestRef op)
{
PaxosServiceMessage *m = static_cast<PaxosServiceMessage*>(op->get_req());
dout(7) << "prepare_update " << *m << " from " << m->get_orig_source_inst() << dendl;
dout(7) << __func__ << " " << *m << " from " << m->get_orig_source_inst() << dendl;

switch (m->get_type()) {
case MSG_MON_COMMAND:
Expand Down Expand Up @@ -688,7 +688,7 @@ bool MonmapMonitor::prepare_command(MonOpRequestRef op)
bool MonmapMonitor::preprocess_join(MonOpRequestRef op)
{
MMonJoin *join = static_cast<MMonJoin*>(op->get_req());
dout(10) << "preprocess_join " << join->name << " at " << join->addr << dendl;
dout(10) << __func__ << " " << join->name << " at " << join->addr << dendl;

MonSession *session = join->get_session();
if (!session ||
Expand Down