From: Seena Fallah Date: Sun, 30 Mar 2025 17:28:20 +0000 (+0200) Subject: rgw: BucketTrimShardCollectCR expect ENODATA as empty X-Git-Tag: v20.3.0~147^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8f604eaf78a86bf26f5682b34b828117b5c6f9e4;p=ceph.git rgw: BucketTrimShardCollectCR expect ENODATA as empty RGWRadosBILogTrimCR() returns ENODATA when nothing is found: ``` 4 trim: failed to trim bilog shard: (61) No data available ``` Signed-off-by: Seena Fallah --- diff --git a/src/rgw/driver/rados/rgw_trim_bilog.cc b/src/rgw/driver/rados/rgw_trim_bilog.cc index d9960289a851..f89db36980bd 100644 --- a/src/rgw/driver/rados/rgw_trim_bilog.cc +++ b/src/rgw/driver/rados/rgw_trim_bilog.cc @@ -367,7 +367,7 @@ class BucketTrimShardCollectCR : public RGWShardCollectCR { size_t i{0}; //< index of current shard marker int handle_result(int r) override { - if (r == -ENOENT) { // ENOENT is not a fatal error + if (r == -ENODATA) { // ENODATA is not a fatal error return 0; } if (r < 0) { @@ -791,10 +791,6 @@ int BucketTrimInstanceCR::operate(const DoutPrefixProvider *dpp) set_status("trimming bilog shards"); yield call(new BucketTrimShardCollectCR(dpp, store, *pbucket_info, totrim.layout.in_index, min_markers)); - // ENODATA just means there were no keys to trim - if (retcode == -ENODATA) { - retcode = 0; - } if (retcode < 0) { ldpp_dout(dpp, 4) << "failed to trim bilog shards: " << cpp_strerror(retcode) << dendl;