From 8e4613633d93c8c9b375d9afe2aa4a58a63bcd7f Mon Sep 17 00:00:00 2001 From: Ali Maredia Date: Wed, 20 Sep 2023 04:12:15 +0000 Subject: [PATCH] rgw: modify ret cond in middle of CreateBucket::Execute() Return prevents swift metadata from being removed if bucket already exists. Signed-off-by: Ali Maredia (cherry picked from commit 0540cc65ef984aab63707bd7d59ecef5a9bdf17b) --- src/rgw/rgw_op.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 88388d42e48..2f5d7115d3a 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -3439,7 +3439,7 @@ void RGWCreateBucket::execute(optional_yield y) * recover from a partial create by retrying it. */ ldpp_dout(this, 20) << "rgw_create_bucket returned ret=" << op_ret << " bucket=" << s->bucket.get() << dendl; - if (op_ret) + if (op_ret < 0 && op_ret != EEXIST && op_ret != ERR_BUCKET_EXISTS) return; const bool existed = s->bucket_exists; -- 2.39.5