*** 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 f4cbac2fb4657bd0c1803d6d6c2c2c8e4ce28a03..c4d7fce8e3860a61bb6dec394d84be89cb9388d9 100644 (file)
--- 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);
   }