osd: do not sync_and_flush if blackholed

If we have blackholed this will block forever.  In that case dont' bother.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 225ac0d98d31128b9f4ce0fc4187643005d70351..dc92ab1b0a1f6f53917acf4fb42f132741028ba5 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -819,8 +819,10 @@ void OSD::suicide(int exitcode)
   recovery_tp.pause();
   command_tp.pause();
 
-  derr << " flushing io" << dendl;
-  store->sync_and_flush();
+  if (!g_conf->filestore_blackhole) {
+    derr << " flushing io" << dendl;
+    store->sync_and_flush();
+  }
 
   derr << " removing pid file" << dendl;
   pidfile_remove();