summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoao Eduardo Luis <joao.luis@inktank.com>2013-10-16 16:19:48 +0100
committerJoao Eduardo Luis <joao.luis@inktank.com>2013-10-23 02:52:01 +0100
commitc521ba78b16f7b7923a051eaecd3775eb94ec274 (patch)
tree5c595cffd3d33baef82514a9b6335cc4b86d57b6
parent5e4652eb8c2c0243ae73376d5235344513be49ea (diff)
downloadceph-c521ba78b16f7b7923a051eaecd3775eb94ec274.tar.gz
mon: MonClient: adjust whitespaces
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
-rw-r--r--src/mon/MonClient.cc19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 38bead8f29f..d034017ce38 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -107,32 +107,31 @@ int MonClient::get_monmap_privately()
{
ldout(cct, 10) << "get_monmap_privately" << dendl;
Mutex::Locker l(monc_lock);
-
+
bool temp_msgr = false;
SimpleMessenger* smessenger = NULL;
if (!messenger) {
messenger = smessenger = new SimpleMessenger(cct,
entity_name_t::CLIENT(-1),
- "temp_mon_client",
- getpid());
+ "temp_mon_client", getpid());
messenger->add_dispatcher_head(this);
smessenger->start();
- temp_msgr = true;
+ temp_msgr = true;
}
-
+
int attempt = 10;
-
+
ldout(cct, 10) << "have " << monmap.epoch << " fsid " << monmap.fsid << dendl;
-
+
while (monmap.fsid.is_zero()) {
cur_mon = _pick_random_mon();
cur_con = messenger->get_connection(monmap.get_inst(cur_mon));
ldout(cct, 10) << "querying mon." << cur_mon << " " << cur_con->get_peer_addr() << dendl;
messenger->send_message(new MMonGetMap, cur_con);
-
+
if (--attempt == 0)
break;
-
+
utime_t interval;
interval.set_from_double(cct->_conf->mon_client_hunt_interval);
map_cond.WaitInterval(cct, monc_lock, interval);
@@ -153,7 +152,7 @@ int MonClient::get_monmap_privately()
messenger = 0;
monc_lock.Lock();
}
-
+
hunting = true; // reset this to true!
cur_mon.clear();