mds: avoid recursion on log trim

diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index 07951caa69239a1a75e97d18489c441811344e47..7b919592caafaf38f5cbae7b5c37fc7aa30baef6 100644 (file)
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@ -237,9 +237,6 @@ void MDLog::flush()
   if (unflushed)
     journaler->flush();
   unflushed = 0;
-
-  // trim
-  trim();
 }
 
 void MDLog::cap()

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 21abdb0d8177cf8d8aea2cd5fd7bbd158f9fdca4..5689692e94dda085e8be2d766d853e82bb1ee11a 100644 (file)
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -388,8 +388,9 @@ void MDS::tick()
   if (laggy)
     return;
 
-  // make sure mds log flushes periodically
+  // make sure mds log flushes, trims periodically
   mdlog->flush();
+  mdlog->trim();
 
   // log
   mds_load_t load = balancer->get_load();