From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 12 Apr 2018 17:14:18 +0000 (-0700)
Subject: ceph-fuse: exit with failure on failed mount
X-Git-Tag: v12.2.6~67^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=97f69520a1d8e318acb4a678fb32d2e857bbcc40;p=ceph.git

ceph-fuse: exit with failure on failed mount

Fixes: https://tracker.ceph.com/issues/23665

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 7740fcde942603750029322ad2c16c18a7b546ab)

Conflicts:
	src/ceph_fuse.cc : Resolved in main
---

diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc
index 851425af0970..f37130a52c5e 100644
--- a/src/ceph_fuse.cc
+++ b/src/ceph_fuse.cc
@@ -254,9 +254,11 @@ int main(int argc, const char **argv, const char *envp[]) {
     r = client->mount(g_conf->client_mountpoint.c_str(), perms,
 		      g_ceph_context->_conf->fuse_require_active_mds);
     if (r < 0) {
-      if (r == CEPH_FUSE_NO_MDS_UP)
+      if (r == CEPH_FUSE_NO_MDS_UP) {
         cerr << "ceph-fuse[" << getpid() << "]: probably no MDS server is up?" << std::endl;
-      cerr << "ceph-fuse[" << getpid() << "]: ceph mount failed with " << cpp_strerror(-r) << std::endl;
+      }
+      cerr << "ceph-fuse[" << getpid() << "]: ceph mount failed with " << cpp_strerror(-r) << std::endl;r = EXIT_FAILURE;
+      r = EXIT_FAILURE;
       goto out_shutdown;
     }