From: Greg Farnum <gregory.farnum@dreamhost.com>
Date: Fri, 18 Nov 2011 23:56:35 +0000 (-0800)
Subject: osdmon: set the maps-to-keep floor to be at least epoch 0
X-Git-Tag: v0.39~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc5b5e17e64c011b68cc8560676182e187bbb503;p=ceph-ci.git

osdmon: set the maps-to-keep floor to be at least epoch 0

Looks like this conditional was just set backwards by mistake. There
have been a number of issues with OSDMap versions that are probably
related to this...
(Thanks to some smarts in trim_to, we at least did not trim ALL of
our maps. But on every tick prior to epoch 500 [that's the default]
the leader was trimming all old maps off the system.)

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 61c7bf58538..eef90a2b85c 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1141,7 +1141,7 @@ void OSDMonitor::tick()
     dout(10) << " min_last_epoch_clean " << floor << dendl;
     unsigned min = g_conf->mon_min_osdmap_epochs;
     if (floor + min > paxos->get_version()) {
-      if (min > paxos->get_version())
+      if (min < paxos->get_version())
 	floor = paxos->get_version() - min;
       else
 	floor = 0;