From: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Date: Wed, 20 Jun 2018 03:45:45 +0000 (+0800)
Subject: rgw: "radosgw-admin objects expire" always returns ok even if the process
X-Git-Tag: v12.2.13~191^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F28784%2Fhead;p=ceph.git

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 <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit f6fe07e8f549f6c54e4bc81a89558f14e71d3d9f)
---

diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index 06a2c4a649ef..f19e10d39519 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<cls_rgw_gc_obj_info>& 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();