From: Kefu Chai <kchai@redhat.com>
Date: Sat, 14 Apr 2018 00:58:53 +0000 (+0800)
Subject: mon/OSDMonitor: txsize should be greater or eq to prune_interval - 1
X-Git-Tag: v13.1.0~261^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f4fabb6d609d613f96ccc7de193451edf4777f7c;p=ceph.git

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 2694011e9701..6e8e533130c7 100644
--- 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;
   }