summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-07-21 22:03:19 -0700
committerSage Weil <sage@inktank.com>2013-07-21 22:03:19 -0700
commit7ab701a6c3b475849beaa4f7a23fb0406126d010 (patch)
treee364d8e8365f33d79774415c98e796220c7de8d5
parenta0cb40b45c4f2f921a63c2d7bb5a28572381d793 (diff)
downloadceph-7ab701a6c3b475849beaa4f7a23fb0406126d010.tar.gz
-rw-r--r--src/mon/OSDMonitor.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 9c854cda86e..a86e13f1423 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -124,7 +124,8 @@ void OSDMonitor::update_from_paxos(bool *need_bootstrap)
* transaction. Start with whichever is newer.
*/
version_t latest_full = get_version_latest_full();
- if (latest_full == 0 && get_first_committed() > 1)
+ if ((latest_full == 0 || latest_full < get_first_committed()) &&
+ get_first_committed() > 1)
latest_full = get_first_committed();
if ((latest_full > 0) && (latest_full > osdmap.epoch)) {
bufferlist latest_bl;