From: redickwang <redickwang@tencent.com>
Date: Mon, 12 Jun 2017 08:43:08 +0000 (+0800)
Subject: mds: mds perf item 'mds_log::expos' always behind journaler
X-Git-Tag: v12.1.0~30^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=992ce03e54966bbab3979adec2cbbb4defcb8e0c;p=ceph.git

mds: mds perf item 'mds_log::expos' always behind journaler

Signed-off-by: redickwang <redickwang@tencent.com>
---

diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index c52c726ff1c..e8e5d3abe7a 100644
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@ -782,9 +782,11 @@ void MDLog::_trim_expired_segments()
     // this was the oldest segment, adjust expire pos
     if (journaler->get_expire_pos() < ls->end) {
       journaler->set_expire_pos(ls->end);
+      logger->set(l_mdl_expos, ls->end);
+    } else {
+      logger->set(l_mdl_expos, ls->offset);
     }
     
-    logger->set(l_mdl_expos, ls->offset);
     logger->inc(l_mdl_segtrm);
     logger->inc(l_mdl_evtrm, ls->num_events);