mon: fix osdmap trimming unsigned overflow

This was trimming way to aggressively for early epochs due to the unsigned
version overflowing.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 3af27eb2421449f4c540527012862c7b6e674555..a25235bae9d12831cd34229137b9e3013fc6da29 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1113,7 +1113,8 @@ void OSDMonitor::tick()
       mon->pgmon()->pg_map.creating_pgs.empty()) {
     epoch_t floor = mon->pgmon()->pg_map.calc_min_last_epoch_clean();
     dout(10) << " min_last_epoch_clean " << floor << dendl;
-    if (floor < paxos->get_version() - 10) {
+    unsigned min = 100;
+    if (floor + min < paxos->get_version()) {
       epoch_t of = paxos->get_first_committed();
       paxos->trim_to(floor);
       while (of < floor) {