From f4fabb6d609d613f96ccc7de193451edf4777f7c Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 14 Apr 2018 08:58:53 +0800 Subject: [PATCH] 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 --- src/mon/OSDMonitor.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 2694011e97013..6e8e533130c77 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; } -- 2.39.5