From: Daniel Gryniewicz <dang@redhat.com>
Date: Mon, 31 Aug 2020 14:02:20 +0000 (-0400)
Subject: Merge pull request #34653 from clwluvw/bucket-stats
X-Git-Tag: v16.1.0~1267
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ec13f4a72e833cc5007af3b64936cb3f6442ebfd;p=ceph.git

Merge pull request #34653 from clwluvw/bucket-stats

rgw: Add bucket name to bucket stats error logging
---

ec13f4a72e833cc5007af3b64936cb3f6442ebfd
diff --cc src/rgw/rgw_bucket.cc
index a59b2039382e8,94e275f5c2660..68e011c73cec8
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@@ -1318,11 -1376,9 +1318,11 @@@ static int bucket_stats(rgw::sal::RGWRa
  
    string bucket_ver, master_ver;
    string max_marker;
 -  int ret = store->getRados()->get_bucket_stats(bucket_info, RGW_NO_SHARD, &bucket_ver, &master_ver, stats, &max_marker);
 +  int ret = store->getRados()->get_bucket_stats(bucket_info, RGW_NO_SHARD,
 +						&bucket_ver, &master_ver, stats,
 +						&max_marker);
    if (ret < 0) {
-     cerr << "error getting bucket stats ret=" << ret << std::endl;
+     cerr << "error getting bucket stats bucket=" << bucket.name << " ret=" << ret << std::endl;
      return ret;
    }