update ceph source to reef 18.2.0

[ceph.git] / ceph / src / rgw / driver / rados / rgw_zone.cc

diff --git a/ceph/src/rgw/driver/rados/rgw_zone.cc b/ceph/src/rgw/driver/rados/rgw_zone.cc
index 339d337b6d440d5f4bdaf19501318c9edfbafdf4..ed09f24f6c24b1c9e25d070edd0a5fa23a1ee732 100644 (file)
--- a/ceph/src/rgw/driver/rados/rgw_zone.cc
+++ b/ceph/src/rgw/driver/rados/rgw_zone.cc
@@ -81,10 +81,12 @@ int RGWZoneGroup::create_default(const DoutPrefixProvider *dpp, optional_yield y
   default_zone.id = zone_params.get_id();
   master_zone = default_zone.id;
 
-  // enable all supported features
-  enabled_features.insert(rgw::zone_features::supported.begin(),
-                          rgw::zone_features::supported.end());
-  default_zone.supported_features = enabled_features;
+  // initialize supported zone features
+  default_zone.supported_features.insert(rgw::zone_features::supported.begin(),
+                                         rgw::zone_features::supported.end());
+  // enable default zonegroup features
+  enabled_features.insert(rgw::zone_features::enabled.begin(),
+                          rgw::zone_features::enabled.end());
   
   r = create(dpp, y);
   if (r < 0 && r != -EEXIST) {