From: Greg Farnum <gfarnum@redhat.com>
Date: Tue, 6 Dec 2016 23:07:19 +0000 (-0800)
Subject: ceph-fuse: start up log on parent process before shutdown
X-Git-Tag: v10.2.10~50^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16963%2Fhead;p=ceph.git

ceph-fuse: start up log on parent process before shutdown

Otherwise, we hit an assert in the Ceph context and logging teardown.

Fixes: http://tracker.ceph.com/issues/18157

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit cbf18b1d80d214e4203e88637acf4b0a0a201ee7)
---

diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc
index e8d57c74f6a9..d2baa9606f21 100644
--- a/src/ceph_fuse.cc
+++ b/src/ceph_fuse.cc
@@ -297,6 +297,8 @@ int main(int argc, const char **argv, const char *envp[]) {
     //cout << "child done" << std::endl;
     return r;
   } else {
+    if (restart_log)
+      g_ceph_context->_log->start();
     // i am the parent
     //cout << "parent, waiting for signal" << std::endl;
     ::close(fd[1]);