From: Shilpa Jagannath <smanjara@redhat.com>
Date: Tue, 24 Oct 2023 16:13:21 +0000 (-0400)
Subject: rgw/multisite: set versioning status in archive zone upon bucket creation
X-Git-Tag: v19.0.0~83^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F54171%2Fhead;p=ceph.git

rgw/multisite: set versioning status in archive zone upon bucket creation

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
---

diff --git a/src/rgw/driver/rados/rgw_bucket.cc b/src/rgw/driver/rados/rgw_bucket.cc
index d6d83eab3dc..eb410fe0582 100644
--- a/src/rgw/driver/rados/rgw_bucket.cc
+++ b/src/rgw/driver/rados/rgw_bucket.cc
@@ -2575,15 +2575,16 @@ int RGWMetadataHandlerPut_BucketInstance::put_check(const DoutPrefixProvider *dp
     }
     bci.info.layout.current_index.layout.type = rule_info.index_type;
   } else {
-    /* always keep bucket versioning enabled on archive zone */
-    if (bihandler->driver->get_zone()->get_tier_type() == "archive") {
-      bci.info.flags = (bci.info.flags & ~BUCKET_VERSIONS_SUSPENDED) | BUCKET_VERSIONED;
-    }
     /* existing bucket, keep its placement */
     bci.info.bucket.explicit_placement = old_bci->info.bucket.explicit_placement;
     bci.info.placement_rule = old_bci->info.placement_rule;
   }
 
+  //always keep bucket versioning enabled on archive zone
+  if (bihandler->driver->get_zone()->get_tier_type() == "archive") {
+    bci.info.flags = (bci.info.flags & ~BUCKET_VERSIONS_SUSPENDED) | BUCKET_VERSIONED;
+  }
+
   /* record the read version (if any), store the new version */
   bci.info.objv_tracker.read_version = objv_tracker.read_version;
   bci.info.objv_tracker.write_version = objv_tracker.write_version;