]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: lc: fix infinite loop in bucket_lc_prepare 40180/head
authorIlsoo Byun <ilsoobyun@linecorp.com>
Mon, 7 Dec 2020 06:20:53 +0000 (15:20 +0900)
committerMatt Benjamin <mbenjamin@redhat.com>
Wed, 17 Mar 2021 13:11:32 +0000 (09:11 -0400)
Fixes: https://tracker.ceph.com/issues/49862
Signed-off-by: Ilsoo Byun <ilsoobyun@linecorp.com>
(cherry picked from commit bc8f304a51afc1398a54cf254e65fd217af00c8a)

src/rgw/rgw_sal_rados.cc

index f84f216b0dd0127ea1d23b3a715c59cdb0778294..157dc88f65c1043732cc7c67401958f7f6a27146 100644 (file)
@@ -1220,6 +1220,8 @@ int RadosLifecycle::set_entry(const string& oid, const LCEntry& entry)
 int RadosLifecycle::list_entries(const string& oid, const string& marker,
                                 uint32_t max_entries, vector<LCEntry>& entries)
 {
+  entries.clear();
+
   vector<cls_rgw_lc_entry> cls_entries;
   int ret = cls_rgw_lc_list(*store->getRados()->get_lc_pool_ctx(), oid, marker, max_entries, cls_entries);