From: Adam Kupczyk <akupczyk@redhat.com>
Date: Sun, 5 Nov 2017 18:09:12 +0000 (-0500)
Subject: Revert "osd/PrimaryLogPG: do not use approx_size() for log trimming"
X-Git-Tag: v13.0.2~523^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7cf39a193d6448389928a72dc33f45e64c8c1fd7;p=ceph.git

Revert "osd/PrimaryLogPG: do not use approx_size() for log trimming"

This reverts commit 024b5bcbf0259eeecba234cff882564947c3a525.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
---

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 3ceee7cb48b3..243d1c9abe73 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -1547,11 +1547,10 @@ void PrimaryLogPG::calc_trim_to()
   eversion_t limit = MIN(
     min_last_complete_ondisk,
     pg_log.get_can_rollback_to());
-  size_t log_size = pg_log.get_log().log.size();
   if (limit != eversion_t() &&
       limit != pg_trim_to &&
-      log_size > target) {
-    size_t num_to_trim = log_size - target;
+      pg_log.get_log().approx_size() > target) {
+    size_t num_to_trim = pg_log.get_log().approx_size() - target;
     if (num_to_trim < cct->_conf->osd_pg_log_trim_min) {
       return;
     }