From: Ilya Dryomov <idryomov@gmail.com>
Date: Fri, 24 Nov 2023 18:53:48 +0000 (+0100)
Subject: tools/rados: just return instead of exit(1) in "rados cppool" handler
X-Git-Tag: v16.2.15~44^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8cf700b6983939bc0c81132d0ffa17bb6a1e6e44;p=ceph.git

tools/rados: just return instead of exit(1) in "rados cppool" handler

Otherwise an occasional segfault occurs.  This instance was missed in
commit 2c149262888c ("tools/rados: always call rados.shutdown() before
exit()").

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit de6635582b7615eb54800a616711073a3c7b0dbd)
---

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index 820b6a3cad6b..26e307fb3397 100644
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -3117,7 +3117,7 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts,
 	cerr << "    If you insist on making a broken copy, you can pass\n"
 	     << "    --yes-i-really-mean-it to proceed anyway."
 	     << std::endl;
-	exit(1);
+	return 1;
       }
     }