summaryrefslogtreecommitdiff
path: root/src/mon
diff options
context:
space:
mode:
authorJoao Eduardo Luis <joao.luis@inktank.com>2012-05-22 22:48:50 -0700
committerJoao Eduardo Luis <joao.luis@inktank.com>2012-05-29 18:34:27 -0700
commit15a30d920a62a9b2b9afd39ef8b0feeeee6febcd (patch)
tree8d1f607b4b6cee16d06f9aef8baab1846380301a /src/mon
parent8c95e8bc38acb3c25199f5365635753f92ee9487 (diff)
downloadceph-15a30d920a62a9b2b9afd39ef8b0feeeee6febcd.tar.gz
mon: Do some aesthetic reformatting on the Elector class.
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
Diffstat (limited to 'src/mon')
-rw-r--r--src/mon/Elector.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index 6b91f5a8d76..cc25cba82a2 100644
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -78,8 +78,8 @@ void Elector::start()
// bcast to everyone else
for (unsigned i=0; i<mon->monmap->size(); ++i) {
if ((int)i == mon->rank) continue;
- mon->messenger->send_message(new MMonElection(MMonElection::OP_PROPOSE, epoch, mon->monmap),
- mon->monmap->get_inst(i));
+ Message *m = new MMonElection(MMonElection::OP_PROPOSE, epoch, mon->monmap);
+ mon->messenger->send_message(m, mon->monmap->get_inst(i));
}
reset_timer();
@@ -294,7 +294,8 @@ void Elector::dispatch(Message *m)
return;
}
if (m->get_source().num() >= mon->monmap->size()) {
- dout(5) << " ignoring bogus election message with bad mon rank " << m->get_source() << dendl;
+ dout(5) << " ignoring bogus election message with bad mon rank "
+ << m->get_source() << dendl;
m->put();
return;
}
@@ -303,7 +304,8 @@ void Elector::dispatch(Message *m)
// assume an old message encoding would have matched
if (em->fsid != mon->monmap->fsid) {
- dout(0) << " ignoring election msg fsid " << em->fsid << " != " << mon->monmap->fsid << dendl;
+ dout(0) << " ignoring election msg fsid "
+ << em->fsid << " != " << mon->monmap->fsid << dendl;
m->put();
return;
}