tools/rados/rados.cc: fix rados rm --force-full blocking problem

Fixes: https://tracker.ceph.com/issues/36177
Signed-off-by: Yang Honggang <yanghonggang@umcloud.com>
(cherry picked from commit 3d2b99405ebb120d7c3fc1b2710cdfac4a59441a)

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index e365ee534a4455cc58a532c35685a09f10295384..f74eb4647ece3697b30857310f3fc1abe32480ab 100644 (file)
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -2912,7 +2912,8 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts,
       const string & oid = *iter;
 
     if (forcefull) {
-        ret = detail::remove(io_ctx, oid, CEPH_OSD_FLAG_FULL_FORCE, use_striper);
+        ret = detail::remove(io_ctx, oid, (CEPH_OSD_FLAG_FULL_FORCE |
+                             CEPH_OSD_FLAG_FULL_TRY), use_striper);
     } else {
         ret = detail::remove(io_ctx, oid, use_striper);
     }