diff options
| author | Sage Weil <sage@inktank.com> | 2014-03-14 21:21:51 +0100 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2014-03-14 21:21:51 +0100 |
| commit | 0e0a9dbfde1a899f338e665e827ad367e2e81c35 (patch) | |
| tree | 823c067b30452163d966e28a8dfc1def6f3d85be /src/mon | |
| parent | tools/: make filenames consistent (diff) | |
| parent | unittest_mon_pgmap: fix warnings (diff) | |
| download | ceph-0e0a9dbfde1a899f338e665e827ad367e2e81c35.tar.xz ceph-0e0a9dbfde1a899f338e665e827ad367e2e81c35.zip | |
Merge remote-tracking branch 'gh/firefly'
Diffstat (limited to 'src/mon')
| -rw-r--r-- | src/mon/Monitor.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 5697d0e97a5..a2d11120625 100644 --- 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(); } |