From 3b253bdf9ff3d9d2bc3d5da21bb635b96b4d654a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 24 Dec 2008 14:18:59 -0800 Subject: [PATCH] mds: avoid recursion on log trim --- src/mds/MDLog.cc | 3 --- src/mds/MDS.cc | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc index 07951caa69239..7b919592caafa 100644 --- 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 21abdb0d8177c..5689692e94dda 100644 --- 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(); -- 2.39.5