]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-fuse: start up log on parent process before shutdown 16963/head
authorGreg Farnum <gfarnum@redhat.com>
Tue, 6 Dec 2016 23:07:19 +0000 (15:07 -0800)
committerNathan Cutler <ncutler@suse.com>
Thu, 10 Aug 2017 12:26:18 +0000 (14:26 +0200)
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)

src/ceph_fuse.cc

index e8d57c74f6a97cc13d07540aedc761175604498b..d2baa9606f21e931bc4ed2a63e55c01955ad1c15 100644 (file)
@@ -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]);