From: Javier M. Mellid <jmunhoz@igalia.com>
Date: Wed, 2 Mar 2016 17:43:24 +0000 (+0100)
Subject: rgw: avoid showing payer when payer == owner
X-Git-Tag: v10.1.0~227^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4727d4261d538cdaaca56fad1c99bb26648b59f1;p=ceph.git

rgw: avoid showing payer when payer == owner

If the payer matches the owner it shows the owner only.

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

diff --git a/src/rgw/rgw_usage.cc b/src/rgw/rgw_usage.cc
index 82ab5ae584bf..03a4ab4de088 100644
--- a/src/rgw/rgw_usage.cc
+++ b/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);