import ceph pacific 16.2.5

[ceph.git] / ceph / src / rgw / rgw_usage.cc

diff --git a/ceph/src/rgw/rgw_usage.cc b/ceph/src/rgw/rgw_usage.cc
index 34884e0b8234dd8b3f4f5e8e4d312692f15f8c52..e1a1d1d6fd6d426e3e96c3fe1faaa20956ad3096 100644 (file)
--- a/ceph/src/rgw/rgw_usage.cc
+++ b/ceph/src/rgw/rgw_usage.cc
@@ -29,7 +29,7 @@ static void dump_usage_categories_info(Formatter *formatter, const rgw_usage_log
   formatter->close_section(); // categories
 }
 
-int RGWUsage::show(RGWRados *store, const rgw_user& uid, const string& bucket_name, uint64_t start_epoch,
+int RGWUsage::show(const DoutPrefixProvider *dpp, RGWRados *store, const rgw_user& uid, const string& bucket_name, uint64_t start_epoch,
                   uint64_t end_epoch, bool show_log_entries, bool show_log_sum, map<string, bool> *categories,
                   RGWFormatterFlusher& flusher)
 {
@@ -52,7 +52,7 @@ int RGWUsage::show(RGWRados *store, const rgw_user& uid, const string& bucket_na
   bool user_section_open = false;
   map<string, rgw_usage_log_entry> summary_map;
   while (is_truncated) {
-    int ret = store->read_usage(uid, bucket_name, start_epoch, end_epoch, max_entries,
+    int ret = store->read_usage(dpp, uid, bucket_name, start_epoch, end_epoch, max_entries,
                                 &is_truncated, usage_iter, usage);
 
     if (ret == -ENOENT) {
@@ -139,13 +139,13 @@ int RGWUsage::show(RGWRados *store, const rgw_user& uid, const string& bucket_na
   return 0;
 }
 
-int RGWUsage::trim(RGWRados *store, const rgw_user& uid, const string& bucket_name, uint64_t start_epoch,
+int RGWUsage::trim(const DoutPrefixProvider *dpp, RGWRados *store, const rgw_user& uid, const string& bucket_name, uint64_t start_epoch,
                    uint64_t end_epoch)
 {
-  return store->trim_usage(uid, bucket_name, start_epoch, end_epoch);
+  return store->trim_usage(dpp, uid, bucket_name, start_epoch, end_epoch);
 }
 
-int RGWUsage::clear(RGWRados *store)
+int RGWUsage::clear(const DoutPrefixProvider *dpp, RGWRados *store)
 {
-  return store->clear_usage();
+  return store->clear_usage(dpp);
 }