From: Sage Weil <sage@redhat.com>
Date: Sat, 11 Apr 2015 00:07:58 +0000 (-0700)
Subject: osd: sync (no flush) on osd suicide
X-Git-Tag: v9.1.0~324^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=202aa9c238d181e394c8e23e2dc42a6d4e36d279;p=ceph.git

osd: sync (no flush) on osd suicide

Not that we even need to sync here!

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 76619921a921..bdfb7502f404 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2271,8 +2271,8 @@ void OSD::suicide(int exitcode)
   recovery_tp.pause();
   command_tp.pause();
 
-  derr << " flushing io" << dendl;
-  store->sync_and_flush();
+  derr << " sync store" << dendl;
+  store->sync();
 
   derr << " removing pid file" << dendl;
   pidfile_remove();