From da1e274b2f490113a72b25e53f63138ec77f0d9b Mon Sep 17 00:00:00 2001 From: Yang Honggang Date: Tue, 25 Sep 2018 18:19:40 +0800 Subject: [PATCH] tools/rados/rados.cc: fix rados rm --force-full blocking problem Fixes: https://tracker.ceph.com/issues/36177 Signed-off-by: Yang Honggang (cherry picked from commit 3d2b99405ebb120d7c3fc1b2710cdfac4a59441a) Conflicts: src/tools/rados/rados.cc - trivial resolution --- src/tools/rados/rados.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc index 04fb7458637..00c5d0be5d1 100644 --- a/src/tools/rados/rados.cc +++ b/src/tools/rados/rados.cc @@ -2704,13 +2704,13 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts, const string & oid = *iter; if (use_striper) { if (forcefull) { - ret = striper.remove(oid, CEPH_OSD_FLAG_FULL_FORCE); + ret = striper.remove(oid, (CEPH_OSD_FLAG_FULL_FORCE | CEPH_OSD_FLAG_FULL_TRY)); } else { ret = striper.remove(oid); } } else { if (forcefull) { - ret = io_ctx.remove(oid, CEPH_OSD_FLAG_FULL_FORCE); + ret = io_ctx.remove(oid, (CEPH_OSD_FLAG_FULL_FORCE | CEPH_OSD_FLAG_FULL_TRY)); } else { ret = io_ctx.remove(oid); } -- 2.47.3