rgw: use bucket service for get_bucket_info

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/src/rgw/rgw_trim_bilog.cc b/src/rgw/rgw_trim_bilog.cc
index 1209375ca73..597ed045609 100644
--- a/src/rgw/rgw_trim_bilog.cc
+++ b/src/rgw/rgw_trim_bilog.cc
@@ -29,6 +29,7 @@
 #include "rgw_rados.h"
 #include "rgw_zone.h"
 #include "rgw_sync.h"
+#include "rgw_bucket.h"
 
 #include "services/svc_zone.h"
 
@@ -416,6 +417,7 @@ class BucketTrimInstanceCR : public RGWCoroutine {
   RGWHTTPManager *const http;
   BucketTrimObserver *const observer;
   std::string bucket_instance;
+  rgw_bucket bucket;
   const std::string& zone_id; //< my zone id
   RGWBucketInfo bucket_info; //< bucket instance info to locate bucket indices
   int child_ret = 0;
@@ -432,8 +434,9 @@ class BucketTrimInstanceCR : public RGWCoroutine {
       http(http), observer(observer),
       bucket_instance(bucket_instance),
       zone_id(store->svc.zone->get_zone().id),
-      peer_status(store->svc.zone->get_zone_data_notify_to_map().size())
-  {}
+      peer_status(store->svc.zone->get_zone_data_notify_to_map().size()) {
+    rgw_bucket_parse_bucket_key(cct, bucket_instance, &bucket, nullptr);
+  }
 
   int operate() override;
 };
@@ -464,7 +467,7 @@ int BucketTrimInstanceCR::operate()
       }
       // in parallel, read the local bucket instance info
       spawn(new RGWGetBucketInstanceInfoCR(store->get_async_rados(), store,
-                                           bucket_instance, &bucket_info),
+                                           bucket, &bucket_info),
             false);
     }
     // wait for a response from each peer. all must respond to attempt trim