mon/OSDMonitor: txsize should be greater or eq to prune_interval - 1

so we can prune 1 or more intervals in a single iteration. and in each
interval, we prune (prune_interval - 1) versions of osdmap.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 2694011e97013e45b79c7c91b916029ec4f4a156..6e8e533130c777fa1fa68a0393e7d4a75b8797b7 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1776,10 +1776,10 @@ bool OSDMonitor::_prune_sanitize_options() const
     r = false;
   }
 
-  if (txsize <= prune_interval) {
+  if (txsize < prune_interval - 1) {
     derr << __func__
          << "'mon_osdmap_full_prune_txsize' (" << txsize
-         << ") <= 'mon_osdmap_full_prune_interval' (" << prune_interval
+         << ") < 'mon_osdmap_full_prune_interval-1' (" << prune_interval - 1
          << "); abort." << dendl;
     r = false;
   }