From 836770bca255aaaefb3a90a9967f5a104fe63d83 Mon Sep 17 00:00:00 2001 From: Ceph Maintainers Date: Fri, 5 Apr 2019 14:12:52 +0100 Subject: [PATCH] bit-ftbfs Gbp-Pq: Name 32-bit-ftbfs.patch --- src/osd/PrimaryLogPG.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 0074c7964..610b2596f 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -1582,8 +1582,9 @@ void PrimaryLogPG::calc_trim_to() if (limit != eversion_t() && limit != pg_trim_to && pg_log.get_log().approx_size() > target) { + size_t osd_pg_log_trim_max = cct->_conf->osd_pg_log_trim_max; size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target, - cct->_conf->osd_pg_log_trim_max); + osd_pg_log_trim_max); if (num_to_trim < cct->_conf->osd_pg_log_trim_min && cct->_conf->osd_pg_log_trim_max >= cct->_conf->osd_pg_log_trim_min) { return; @@ -1628,8 +1629,9 @@ void PrimaryLogPG::calc_trim_to_aggressive() pg_log.get_log().approx_size() > target) { dout(10) << __func__ << " approx pg log length = " << pg_log.get_log().approx_size() << dendl; + size_t osd_pg_log_trim_max = cct->_conf->osd_pg_log_trim_max; size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target, - cct->_conf->osd_pg_log_trim_max); + osd_pg_log_trim_max); dout(10) << __func__ << " num_to_trim = " << num_to_trim << dendl; if (num_to_trim < cct->_conf->osd_pg_log_trim_min && cct->_conf->osd_pg_log_trim_max >= cct->_conf->osd_pg_log_trim_min) { -- 2.30.2