rgw: add bucket request payment feature usage statistics integration

src/cls/rgw/cls_rgw_types.h

@@ -721,9 +721,7 @@ struct rgw_usage_log_entry {
       epoch = e.epoch;
       payer = e.payer;
     }
-    if (payer != e.payer) {
-      return; /* can't aggregate differet payers */
-    }
+
     map<string, rgw_usage_data>::const_iterator iter;
     for (iter = e.usage_map.begin(); iter != e.usage_map.end(); ++iter) {
       if (!categories || !categories->size() || categories->count(iter->first)) {

src/rgw/rgw_log.cc

@@ -188,27 +188,35 @@ static void log_usage(struct req_state *s, const string& op_name)
 
   rgw_user user;
   rgw_user payer;
+  string bucket_name;
 
-  if (!s->bucket_name.empty()) {
+  bucket_name = s->bucket_name;
+
+  if (!bucket_name.empty()) {
     user = s->bucket_owner.get_id();
     if (s->bucket_info.requester_pays) {
       payer = s->user->user_id;
     }
   } else {
-    user = s->user->user_id;
+      user = s->user->user_id;
+  }
+
+  bool error = s->err.is_err();
+  if (error && s->err.http_ret == 404) {
+    bucket_name = "-"; /* bucket not found, use the invalid '-' as bucket name */
   }
 
   string u = user.to_str();
   string p = payer.to_str();
-  rgw_usage_log_entry entry(u, p, s->bucket.name);
+  rgw_usage_log_entry entry(u, p, bucket_name);
 
   uint64_t bytes_sent = s->cio->get_bytes_sent();
   uint64_t bytes_received = s->cio->get_bytes_received();
 
   rgw_usage_data data(bytes_sent, bytes_received);
 
   data.ops = 1;
-  if (!s->err.is_err())
+  if (!error)
     data.successful_ops = 1;
 
   entry.add(op_name, data);

src/rgw/rgw_usage.cc

@@ -88,9 +88,10 @@ int RGWUsage::show(RGWRados *store, rgw_user& uid, uint64_t start_epoch,
         utime_t ut(entry.epoch, 0);
         ut.gmtime(formatter->dump_stream("time"));
         formatter->dump_int("epoch", entry.epoch);
-        formatter->dump_string("owner", entry.owner.to_str());
+        string owner = entry.owner.to_str();
         string payer = entry.payer.to_str();
-        if (!payer.empty()) {
+        formatter->dump_string("owner", owner);
+        if (!payer.empty() && payer != owner) {
           formatter->dump_string("payer", payer);
         }
         dump_usage_categories_info(formatter, entry, categories);