From: Javier M. Mellid <jmunhoz@igalia.com>
Date: Sat, 5 Mar 2016 12:06:41 +0000 (+0100)
Subject: rgw: fix usage log aggregation
X-Git-Tag: v10.1.0~169^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6656%2Fhead;p=ceph.git

rgw: fix usage log aggregation

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
---

diff --git a/src/cls/rgw/cls_rgw_types.h b/src/cls/rgw/cls_rgw_types.h
index 9efc2288d57c..080a856b4ae7 100644
--- a/src/cls/rgw/cls_rgw_types.h
+++ b/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)) {