]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
OSD: fix fusestore hanging during stop/quit
authorxie xingguo <xie.xingguo@zte.com.cn>
Wed, 17 Feb 2016 10:28:11 +0000 (18:28 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Wed, 17 Feb 2016 10:28:11 +0000 (18:28 +0800)
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>
src/osd/OSD.cc

index 7345d535301b84d1ec3744827043d4c15378048b..e7d2ee37c101f0d37121764dde219979277abe95 100644 (file)
@@ -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;