From: Sage Weil <sage@newdream.net>
Date: Wed, 15 Feb 2012 16:21:02 +0000 (-0800)
Subject: osd: do not sync_and_flush if blackholed
X-Git-Tag: v0.43~78
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c1b6b218d21d51d40062ecd1ec680d26c3b437eb;p=ceph.git

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 225ac0d98d311..dc92ab1b0a1f6 100644
--- 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();