summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Durgin <josh.durgin@inktank.com>2013-11-02 00:12:52 +0100
committerJosh Durgin <josh.durgin@inktank.com>2013-11-02 00:13:52 +0100
commit306ec7142d699c26ce874b11dc02ccdb3cf296c7 (patch)
tree2b0051c0ffc4a0aa8c7c471043e5ad696b01308f
parentMerge pull request #802 from ceph/wip-6673b (diff)
downloadceph-306ec7142d699c26ce874b11dc02ccdb3cf296c7.tar.xz
ceph-306ec7142d699c26ce874b11dc02ccdb3cf296c7.zip
rgw: don't turn 404 into 400 for the replicalog api
404 is not actually a problem to clients like radosgw-agent, but 400 implies something about the request was incorrect. Backport: dumpling Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
-rw-r--r--src/rgw/rgw_rest_replica_log.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rgw/rgw_rest_replica_log.cc b/src/rgw/rgw_rest_replica_log.cc
index 600a8edb78c..2543f32fba6 100644
--- a/src/rgw/rgw_rest_replica_log.cc
+++ b/src/rgw/rgw_rest_replica_log.cc
@@ -171,7 +171,9 @@ static int bucket_instance_to_bucket(RGWRados *store, string& bucket_instance, r
int r = store->get_bucket_instance_info(NULL, bucket_instance, bucket_info, &mtime, NULL);
if (r < 0) {
- dout(5) << "could not get bucket instance info for bucket=" << bucket_instance << dendl;
+ dout(5) << "could not get bucket instance info for bucket=" << bucket_instance << ": " << cpp_strerror(r) << dendl;
+ if (r == -ENOENT)
+ return r;
return -EINVAL;
}