]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/bilog/trim: (non-functional) remove unused bucket_info from status shards CR
authorOguzhan Ozmen <oozmen@bloomberg.net>
Sun, 5 Jul 2026 13:49:34 +0000 (13:49 +0000)
committerOguzhan Ozmen <oozmen@bloomberg.net>
Fri, 17 Jul 2026 14:24:16 +0000 (14:24 +0000)
The peer -ENOENT handling in RGWReadRemoteStatusShardsCR no longer
consults the local bucket layout (whether Deleted flag set or not),
so its bucket_info member and the matching constructor arg are
not used anymore.

Signed-off-by: Oguzhan Ozmen <oozmen@bloomberg.net>
src/rgw/driver/rados/rgw_trim_bilog.cc

index 700639162b04dd5d41af9c93ddb9e4ebcb6a47a9..1b7237715193be2bc01195d831e38284333a5f5b 100644 (file)
@@ -458,7 +458,6 @@ class RGWReadRemoteStatusShardsCR : public RGWCoroutine {
   rgw::sal::RadosStore* const store;
   CephContext *cct;
   RGWHTTPManager *http;
-  const RGWBucketInfo* bucket_info;
   std::string bucket_instance;
   const rgw_zone_id zid;
   const std::string& zone_id;
@@ -469,13 +468,12 @@ public:
                                    rgw::sal::RadosStore* const store,
             CephContext *cct,
             RGWHTTPManager *http,
-            const RGWBucketInfo* bucket_info,
                                    std::string bucket_instance,
             const rgw_zone_id zid,
             const std::string& zone_id,
             StatusShards *p)
     : RGWCoroutine(cct), dpp(dpp), store(store),
-      cct(cct), http(http), bucket_info(bucket_info), bucket_instance(bucket_instance),
+      cct(cct), http(http), bucket_instance(bucket_instance),
       zid(zid), zone_id(zone_id), p(p) {}
 
   int operate(const DoutPrefixProvider *dpp) override {
@@ -857,7 +855,7 @@ int BucketTrimInstanceCR::operate(const DoutPrefixProvider *dpp)
 
       auto p = peer_status.begin();
       for (auto& zid : zids) {
-        spawn(new RGWReadRemoteStatusShardsCR(dpp, store, cct, http, pbucket_info, bucket_instance, zid, zone_id, &*p), false);
+        spawn(new RGWReadRemoteStatusShardsCR(dpp, store, cct, http, bucket_instance, zid, zone_id, &*p), false);
         ++p;
       }
     }