From 3d2b99405ebb120d7c3fc1b2710cdfac4a59441a 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 --- src/tools/rados/rados.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc index e6ac37da15c..943cbe2babb 100644 --- a/src/tools/rados/rados.cc +++ b/src/tools/rados/rados.cc @@ -2904,7 +2904,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); } -- 2.47.3