]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix usage log aggregation 6656/head
authorJavier M. Mellid <jmunhoz@igalia.com>
Sat, 5 Mar 2016 12:06:41 +0000 (13:06 +0100)
committerJavier M. Mellid <jmunhoz@igalia.com>
Sat, 5 Mar 2016 12:08:10 +0000 (13:08 +0100)
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
src/cls/rgw/cls_rgw_types.h

index 9efc2288d57cf3041cfbf744116350e176eeefa5..080a856b4ae77397ee04aa5e0e8ed8c50e3c3238 100644 (file)
@@ -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)) {