From: Adam Kupczyk <akupczyk@redhat.com>
Date: Wed, 10 Jan 2018 13:07:52 +0000 (+0100)
Subject: Revert "osd/osd_type: kill log.approx_size()"
X-Git-Tag: v13.0.2~523^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eb353a18b6220d499279cde10df47bc7daa167c8;p=ceph.git

Revert "osd/osd_type: kill log.approx_size()"

This reverts commit 46bfe362ed3fff41cee878e685e0d95cd1e41fcf.

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

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 243d1c9abe73..31675c50516e 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -711,7 +711,7 @@ void PrimaryLogPG::maybe_force_recovery()
 		  PG_STATE_BACKFILL_TOOFULL))
     return;
 
-  if (pg_log.get_log().log.size() <
+  if (pg_log.get_log().approx_size() <
       cct->_conf->osd_max_pg_log_entries *
         cct->_conf->osd_force_recovery_pg_log_entries_factor)
     return;