From 8b8941c7d18bf6e4f88cada6e7bfe733f2c1ce4c Mon Sep 17 00:00:00 2001 From: "J. Eric Ivancich" Date: Wed, 25 Oct 2023 17:02:12 -0400 Subject: [PATCH] rgw: log errors during "bi list" Currently errors are displayed on STDERR but do not get into the appropriate log. This duplicates the STDERR messages to the log. Signed-off-by: J. Eric Ivancich --- src/rgw/rgw_admin.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index cc7f5811c9ef..62fafdfcfb1b 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -7670,7 +7670,8 @@ next: int ret = init_bucket(user.get(), tenant, bucket_name, bucket_id, &bucket); if (ret < 0) { - cerr << "ERROR: could not init bucket: " << cpp_strerror(-ret) << std::endl; + ldpp_dout(dpp(), 0) << "ERROR: could not init bucket: " << cpp_strerror(-ret) << + dendl; return -ret; } @@ -7690,13 +7691,13 @@ next: int i = (specified_shard_id ? shard_id : 0); for (; i < max_shards; i++) { ldpp_dout(dpp(), 20) << "INFO: " << __func__ << ": starting shard=" << i << dendl; + marker.clear(); RGWRados::BucketShard bs(static_cast(driver)->getRados()); int ret = bs.init(dpp(), bucket->get_info(), index, i, null_yield); - marker.clear(); - if (ret < 0) { - cerr << "ERROR: bs.init(bucket=" << bucket << ", shard=" << i << "): " << cpp_strerror(-ret) << std::endl; + ldpp_dout(dpp(), 0) << "ERROR: bs.init(bucket=" << bucket << ", shard=" << i << + "): " << cpp_strerror(-ret) << dendl; return -ret; } @@ -7705,7 +7706,7 @@ next: // if object is specified, we use that as a filter to only retrieve some some entries ret = static_cast(driver)->getRados()->bi_list(bs, object, marker, max_entries, &entries, &is_truncated, null_yield); if (ret < 0) { - cerr << "ERROR: bi_list(): " << cpp_strerror(-ret) << std::endl; + ldpp_dout(dpp(), 0) << "ERROR: bi_list(): " << cpp_strerror(-ret) << dendl; return -ret; } ldpp_dout(dpp(), 20) << "INFO: " << __func__ << -- 2.47.3