]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: BucketTrimShardCollectCR expect ENODATA as empty
authorSeena Fallah <seenafallah@gmail.com>
Sun, 30 Mar 2025 17:28:20 +0000 (19:28 +0200)
committerSeena Fallah <seenafallah@gmail.com>
Mon, 31 Mar 2025 20:15:15 +0000 (22:15 +0200)
RGWRadosBILogTrimCR() returns ENODATA when nothing is found:
```
4 trim: failed to trim bilog shard: (61) No data available
```

Signed-off-by: Seena Fallah <seenafallah@gmail.com>
src/rgw/driver/rados/rgw_trim_bilog.cc

index d9960289a851984029f95d8ec7cae3709cca78d5..f89db36980bd4a91d24ad703b985c0e9e5c7c681 100644 (file)
@@ -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;