From 97f766a104e29ae6b84b8b30eb1d121a1dd849c7 Mon Sep 17 00:00:00 2001 From: Zhang Shaowen Date: Wed, 20 Jun 2018 11:45:45 +0800 Subject: [PATCH] rgw: "radosgw-admin objects expire" always returns ok even if the process fails. Fixes: http://tracker.ceph.com/issues/24592 Signed-off-by: Zhang Shaowen (cherry picked from commit f6fe07e8f549f6c54e4bc81a89558f14e71d3d9f) --- src/rgw/rgw_rados.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h index 06a2c4a649e..f19e10d3951 100644 --- a/src/rgw/rgw_rados.h +++ b/src/rgw/rgw_rados.h @@ -3625,7 +3625,7 @@ public: int list_gc_objs(int *index, string& marker, uint32_t max, bool expired_only, std::list& result, bool *truncated); int process_gc(bool expired_only); - int process_expire_objects(); + bool process_expire_objects(); int defer_gc(void *ctx, const RGWBucketInfo& bucket_info, const rgw_obj& obj); int process_lc(); -- 2.47.3