From: Sage Weil <sage@redhat.com>
Date: Sun, 21 Sep 2014 20:41:01 +0000 (-0700)
Subject: os/FileJournal: do not request sync while shutting down
X-Git-Tag: v0.86~23^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2549%2Fhead;p=ceph.git

os/FileJournal: do not request sync while shutting down

FileStore calls should_commit_now() to determine whether it should
loop and do a second sync (among other things).  During shutdown, this
can force us into a livelock: the journal is shutting down, but the
sync_entry loop never completes and repeatedly syncs because the
journal is full.  Since the journal is otherwise stopped, no expire
happens and we never become unfull, and we're stuck.

This seems to be triggered semi-reliably by the ceph_objectstore_tool
import function.

Fix by not requesting a sync while shutting down.

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

diff --git a/src/os/FileJournal.h b/src/os/FileJournal.h
index 94197aab3dc9..1920401d378b 100644
--- a/src/os/FileJournal.h
+++ b/src/os/FileJournal.h
@@ -405,7 +405,7 @@ private:
   void commit_start(uint64_t seq);
   void committed_thru(uint64_t seq);
   bool should_commit_now() {
-    return full_state != FULL_NOTFULL;
+    return full_state != FULL_NOTFULL && !write_stop;
   }
 
   void set_wait_on_full(bool b) { wait_on_full = b; }