From 8cf700b6983939bc0c81132d0ffa17bb6a1e6e44 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Fri, 24 Nov 2023 19:53:48 +0100 Subject: [PATCH] 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 (cherry picked from commit de6635582b7615eb54800a616711073a3c7b0dbd) --- src/tools/rados/rados.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc index 820b6a3cad6..26e307fb339 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; } } -- 2.47.3