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

index db3aa543fb56334040a9967e8937b913c8256651..4a38d33abd2d85111d9c5167730a7c3adf2e44f6 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;
       }
     }