]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: "radosgw-admin objects expire" always returns ok even if the process 28784/head
authorZhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Wed, 20 Jun 2018 03:45:45 +0000 (11:45 +0800)
committerJesse Williamson <nerd.cpp@gmail.com>
Thu, 11 Jul 2019 17:32:58 +0000 (10:32 -0700)
fails.

Fixes: http://tracker.ceph.com/issues/24592
Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit f6fe07e8f549f6c54e4bc81a89558f14e71d3d9f)

src/rgw/rgw_rados.h

index 06a2c4a649ef0b61a9177f0742c42131a429c2e8..f19e10d39519e169cd79759666f4bff95b1beadd 100644 (file)
@@ -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();