From: songbaisen <song.baisen@zte.com.cn>
Date: Tue, 12 Jul 2016 08:02:20 +0000 (+0800)
Subject: logmon: check is_leader() before doing any work on get_trim_to()
X-Git-Tag: ses5-milestone5~288^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=76b5451deae506e2067a289ba88b03885ad06e2a;p=ceph.git

logmon: check is_leader() before doing any work on get_trim_to()

Signed-off-by: song baisen <song.baisen@zte.com.cn>
---

diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc
index 9deaf479aeaa..c39d6e994ed9 100644
--- a/src/mon/LogMonitor.cc
+++ b/src/mon/LogMonitor.cc
@@ -236,9 +236,12 @@ void LogMonitor::encode_full(MonitorDBStore::TransactionRef t)
 
 version_t LogMonitor::get_trim_to()
 {
+  if (!mon->is_leader())
+    return 0;
+
   unsigned max = g_conf->mon_max_log_epochs;
   version_t version = get_last_committed();
-  if (mon->is_leader() && version > max)
+  if (version > max)
     return version - max;
   return 0;
 }