From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Wed, 17 Feb 2016 10:28:11 +0000 (+0800)
Subject: OSD: fix fusestore hanging during stop/quit
X-Git-Tag: v10.1.0~311^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4c8f320a7eb3531e9d7be06c1f010da88927e5aa;p=ceph.git

OSD: fix fusestore hanging during stop/quit

If both 'stop' and 'osd_objectstore_fuse' are set to true, then the
fuse_store will be stopped first and then restarted and is left hanging,
which is incorrect.

Fixes: #14786
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 7345d535301b..e7d2ee37c101 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1885,6 +1885,7 @@ int OSD::enable_disable_fuse(bool stop)
       derr << __func__ << " failed to rmdir " << mntpath << dendl;
       return r;
     }
+    return 0;
   }
   if (!fuse_store && g_conf->osd_objectstore_fuse) {
     dout(1) << __func__ << " enabling" << dendl;