From: Ali Maredia <amaredia@redhat.com>
Date: Wed, 20 Sep 2023 04:12:15 +0000 (+0000)
Subject: rgw: modify ret cond in middle of CreateBucket::Execute()
X-Git-Tag: v17.2.8~101^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af4e1b7436ec9d01427ffecceecfca3109b19207;p=ceph.git

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 <amaredia@redhat.com>
(cherry picked from commit 0540cc65ef984aab63707bd7d59ecef5a9bdf17b)
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index f0554f4b664d..9791ccc50bfb 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -3305,7 +3305,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;