From: Kefu Chai <tchaikov@gmail.com>
Date: Mon, 15 Jan 2018 03:14:45 +0000 (+0800)
Subject: Merge pull request #18755 from aclamk/wip-reverted-approx-size
X-Git-Tag: v13.0.2~523
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=17dcd13ee5b6b35ce2c61030e001f0f42ac16ed0;p=ceph.git

Merge pull request #18755 from aclamk/wip-reverted-approx-size

osd/PG: revert approx size

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

17dcd13ee5b6b35ce2c61030e001f0f42ac16ed0
diff --cc src/osd/PrimaryLogPG.cc
index 7310c8699c940,31675c50516e7..80d656ce62e2f
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@@ -1575,14 -1544,13 +1575,13 @@@ void PrimaryLogPG::calc_trim_to(
      target = cct->_conf->osd_max_pg_log_entries;
    }
  
 -  eversion_t limit = MIN(
 +  eversion_t limit = std::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;
      }