diff options
| author | Greg Farnum <gregory.farnum@dreamhost.com> | 2011-11-18 15:56:35 -0800 |
|---|---|---|
| committer | Greg Farnum <gregory.farnum@dreamhost.com> | 2011-11-18 16:13:29 -0800 |
| commit | cc5b5e17e64c011b68cc8560676182e187bbb503 (patch) | |
| tree | ab6eca6a5586c1d22fcfe1cc512e5c8c473ed519 | |
| parent | 45cf89c1089fe419cde6a453acee0dfb82ae58a6 (diff) | |
| download | ceph-cc5b5e17e64c011b68cc8560676182e187bbb503.tar.gz | |
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>
| -rw-r--r-- | src/mon/OSDMonitor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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; |