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 3ceee7cb48b34c7b492f4d5ee4a154a5bcad93ae..243d1c9abe73a4ba0730f8a6fdf72f76783c9452 100644 (file)
--- 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;
     }