]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
tools/rados: just return instead of exit(1) in "rados cppool" handler 55025/head
authorIlya Dryomov <idryomov@gmail.com>
Fri, 24 Nov 2023 18:53:48 +0000 (19:53 +0100)
committerIlya Dryomov <idryomov@gmail.com>
Fri, 29 Dec 2023 11:41:12 +0000 (12:41 +0100)
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)

src/tools/rados/rados.cc

index ed0381b5468f7606062af7a825ab183697facb80..c419a43447af18f76a6e3bdb043716adf9aa7611 100644 (file)
@@ -3133,7 +3133,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;
       }
     }