From: sage <sage@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Fri, 10 Jun 2005 18:54:01 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v0.1~2086
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4fd53bec3f214595e4620f02ad98b9cef8eadddb;p=ceph.git

*** empty log message ***


git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@295 29311d96-e01e-0410-9327-a35deaab8ce9
---

diff --git a/ceph/mds/MDCache.cc b/ceph/mds/MDCache.cc
index f4cbac2fb46..c4d7fce8e38 100644
--- a/ceph/mds/MDCache.cc
+++ b/ceph/mds/MDCache.cc
@@ -555,14 +555,16 @@ bool MDCache::shutdown_pass()
 	return true;
   }
 
-  // (wait for) flush log
-  if (mds->mdlog->get_num_events()) {
-	dout(7) << "waiting for log to flush" << endl;
-	return false;
-  } 
-  
-  // make a pass on the cache
+
+  // flush log?
   if (g_conf.mds_log_flush_on_shutdown) {
+	// (wait for) flush log
+	if (mds->mdlog->get_num_events()) {
+	  dout(7) << "waiting for log to flush" << endl;
+	  return false;
+	} 
+  
+	// make a pass on the cache
 	dout(7) << "log is empty.  flushing cache" << endl;
 	trim(0);
   }