]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: modify ret cond in middle of CreateBucket::Execute()
authorAli Maredia <amaredia@redhat.com>
Wed, 20 Sep 2023 04:12:15 +0000 (04:12 +0000)
committerPeter Razumovsky <prazumovsky@mirantis.com>
Mon, 1 Apr 2024 14:56:13 +0000 (18:56 +0400)
Return prevents swift metadata from being removed
if bucket already exists.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
(cherry picked from commit 0540cc65ef984aab63707bd7d59ecef5a9bdf17b)

src/rgw/rgw_op.cc

index f0554f4b664d1ea19eb4fef8bdfa0cb55ae47563..9791ccc50bfbbb34ea1f3202f138d8e717ac2083 100644 (file)
@@ -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;