]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
logmon: check is_leader() before doing any work on get_trim_to() 10342/head
authorsongbaisen <song.baisen@zte.com.cn>
Tue, 12 Jul 2016 08:02:20 +0000 (16:02 +0800)
committersongbaisen <song.baisen@zte.com.cn>
Wed, 20 Jul 2016 00:37:02 +0000 (08:37 +0800)
Signed-off-by: song baisen <song.baisen@zte.com.cn>
src/mon/LogMonitor.cc

index 9deaf479aeaaa9c7b5f255746bed000445bd2f1a..c39d6e994ed9746c6a02dc919a89188e60f24ab9 100644 (file)
@@ -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;
 }