From 59d098c7771c482695512718e9d80804799873f5 Mon Sep 17 00:00:00 2001 From: "Javier M. Mellid" Date: Wed, 2 Mar 2016 18:43:24 +0100 Subject: [PATCH] rgw: avoid showing payer when payer == owner If the payer matches the owner it shows the owner only. Signed-off-by: Javier M. Mellid --- src/rgw/rgw_usage.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_usage.cc b/src/rgw/rgw_usage.cc index 82ab5ae584bfb..03a4ab4de0881 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);