From: Neha Ojha Date: Tue, 17 Jul 2018 01:11:27 +0000 (-0700) Subject: osd/PGLog: allow pg log trim when complete_to is less than trim_to X-Git-Tag: v12.2.11~13^2~15 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4bee8a0ebe7fe2b7c86cccee30e5468a2a89ea1e;p=ceph.git osd/PGLog: allow pg log trim when complete_to is less than trim_to Signed-off-by: Neha Ojha (cherry picked from commit a5329ba8dd169e55deaff47d042354e53d8e722d) Conflicts: src/osd/PGLog.cc: Now it is possible to have complete_to version less than or equal to trim version, because the pg log length upper limit is a hard limit, and trim can proceed even when there is pending recovery/backfill. So do not complain when this happens. --- diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc index b384a2cdd65..30152539f0a 100644 --- a/src/osd/PGLog.cc +++ b/src/osd/PGLog.cc @@ -50,15 +50,8 @@ void PGLog::IndexedLog::trim( set* trimmed_dups, eversion_t *write_from_dups) { - if (complete_to != log.end() && - complete_to->version <= s) { - generic_dout(0) << " bad trim to " << s << " when complete_to is " - << complete_to->version - << " on " << *this << dendl; - } - assert(s <= can_rollback_to); - generic_dout(0) << " complete_to " << complete_to->version << dendl; + generic_dout(20) << " complete_to " << complete_to->version << dendl; auto earliest_dup_version = log.rbegin()->version.version < cct->_conf->osd_pg_log_dups_tracked