Merge pull request ceph#1461 from ceph/wip-7692

mon: on timecheck on monmap 0 Reviewed-by: Joao Eduardo Luis <[email protected]>
dano · Mar 14, 2014 · a2f3b30 · a2f3b30
2 parents a3719e0 + f1bd59f
commit a2f3b30
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
@@ -651,8 +651,10 @@ int main(int argc, const char **argv)
   }
 
   err = mon->preinit();
-  if (err < 0)
+  if (err < 0) {
+    derr << "failed to initialize" << dendl;
     prefork.exit(1);
+  }
 
   if (compact || g_conf->mon_compact_on_start) {
     derr << "compacting monitor store ..." << dendl;

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
@@ -1601,7 +1601,8 @@ void Monitor::win_election(epoch_t epoch, set<int>& active, uint64_t features,
   health_monitor->start(epoch);
 
   finish_election();
-  if (monmap->size() > 1)
+  if (monmap->size() > 1 &&
+      monmap->get_epoch() > 0)
     timecheck_start();
 }
 

diff --git a/src/msg/Accepter.cc b/src/msg/Accepter.cc
@@ -77,7 +77,7 @@ int Accepter::bind(const entity_addr_t &bind_addr, const set<int>& avoid_ports)
     int on = 1;
     rc = ::setsockopt(listen_sd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
     if (rc < 0) {
-      ldout(msgr->cct,0) << "accepter.bind unable to setsockopt: "
+      lderr(msgr->cct) << "accepter.bind unable to setsockopt: "
 			 << cpp_strerror(errno) << dendl;
       return -errno;
     }