]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-fuse: start up log on parent process before shutdown 12347/head
authorGreg Farnum <gfarnum@redhat.com>
Tue, 6 Dec 2016 23:07:19 +0000 (15:07 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Tue, 6 Dec 2016 23:07:22 +0000 (15:07 -0800)
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>
src/ceph_fuse.cc

index 8bd841be2af22cfd004f6be66ea6c4fc506bd25e..d6983d932e9613c8a7dd40153b382bc8a71aba1f 100644 (file)
@@ -295,6 +295,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]);