From 071808ad766cd624c6fc21f06cc283d5b150f0e2 Mon Sep 17 00:00:00 2001 From: "cao.leilc" Date: Tue, 3 Nov 2020 14:41:36 +0800 Subject: [PATCH] rgw : modify error message to NoSuchBucket when bucket doesn't exist in bucket info API Fixes: https://tracker.ceph.com/issues/48073 Signed-off-by: caolei (cherry picked from commit bc5ef5c9cf0ea89fc028332c39766eb8e7e1bd0b) Conflicts: src/rgw/rgw_bucket.cc - bucket.init() call has an additional argument in master --- src/rgw/rgw_bucket.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index 830efa60e58..7ea22e44390 100644 --- a/src/rgw/rgw_bucket.cc +++ b/src/rgw/rgw_bucket.cc @@ -1649,7 +1649,9 @@ int RGWBucketAdminOp::info(RGWRados *store, RGWBucketAdminOpState& op_state, const std::string& bucket_name = op_state.get_bucket_name(); if (!bucket_name.empty()) { ret = bucket.init(store, op_state); - if (ret < 0) + if (-ENOENT == ret) + return -ERR_NO_SUCH_BUCKET; + else if (ret < 0) return ret; } -- 2.47.3