From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 28 Nov 2019 01:46:00 +0000 (-0800)
Subject: rgw: put bucket replication extension
X-Git-Tag: v15.1.0~22^2~32
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4a587952df8f65aa2516051932f0e3908a136154;p=ceph.git

rgw: put bucket replication extension

Now able to set specific source and destination zones

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index be0d1b9cbea2..952409dc09c0 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -623,6 +623,14 @@ struct ReplicationConfiguration {
       }
     };
 
+    struct Source { /* rgw extension */
+      std::vector<string> zone_names;
+
+      void decode_xml(XMLObj *obj) {
+        RGWXMLDecoder::decode_xml("Zone", zone_names, obj);
+      }
+    };
+
     struct Destination {
       struct AccessControlTranslation {
         string owner;
@@ -636,6 +644,7 @@ struct ReplicationConfiguration {
       std::optional<string> account;
       string bucket;
       std::optional<string> storage_class;
+      std::vector<string> zone_names;
 
       void decode_xml(XMLObj *obj) {
         RGWXMLDecoder::decode_xml("AccessControlTranslation", acl_translation, obj);
@@ -648,6 +657,7 @@ struct ReplicationConfiguration {
         if (storage_class && storage_class->empty()) {
           storage_class.reset();
         }
+        RGWXMLDecoder::decode_xml("Zone", zone_names, obj); /* rgw extension */
       }
     };
 
@@ -748,7 +758,22 @@ struct ReplicationConfiguration {
       }
     };
 
+    set<rgw_zone_id> get_zone_ids_from_names(rgw::sal::RGWRadosStore *store,
+                                             const vector<string>& zone_names) const {
+      set<rgw_zone_id> ids;
+
+      for (auto& name : zone_names) {
+        rgw_zone_id id;
+        if (store->svc()->zone->find_zone_id_by_name(name, &id)) {
+          ids.insert(std::move(id));
+        }
+      }
+
+      return std::move(ids);
+    }
+
     std::optional<DeleteMarkerReplication> delete_marker_replication;
+    std::optional<Source> source;
     Destination destination;
     std::optional<Filter> filter;
     string id;
@@ -757,6 +782,7 @@ struct ReplicationConfiguration {
 
     void decode_xml(XMLObj *obj) {
       RGWXMLDecoder::decode_xml("DeleteMarkerReplication", delete_marker_replication, obj);
+      RGWXMLDecoder::decode_xml("Source", source, obj);
       RGWXMLDecoder::decode_xml("Destination", destination, obj);
       RGWXMLDecoder::decode_xml("ID", id, obj);
 
@@ -789,7 +815,7 @@ struct ReplicationConfiguration {
       return true;
     }
 
-    int to_sync_policy_pipe(req_state *s,
+    int to_sync_policy_pipe(req_state *s, rgw::sal::RGWRadosStore *store,
                             rgw_sync_bucket_pipes *pipe,
                             bool *enabled) const {
       if (!is_valid(s->cct)) {
@@ -804,12 +830,16 @@ struct ReplicationConfiguration {
       rgw_bucket_key dest_bk(user_id.tenant,
                              destination.bucket);
 
-      pipe->source.set_all_zones(true); /*
-                                           all zones that correspond with configured flow,
-                                           we can introduce extended api to select specific
-                                           zones
-                                         */
-      pipe->dest.set_all_zones(true);
+      if (source && !source->zone_names.empty()) {
+        pipe->source.zones = get_zone_ids_from_names(store, source->zone_names);
+      } else {
+        pipe->source.set_all_zones(true);
+      }
+      if (!destination.zone_names.empty()) {
+        pipe->dest.zones = get_zone_ids_from_names(store, destination.zone_names);
+      } else {
+        pipe->dest.set_all_zones(true);
+      }
       pipe->dest.bucket.emplace(dest_bk);
 
       if (filter) {
@@ -844,7 +874,7 @@ struct ReplicationConfiguration {
     RGWXMLDecoder::decode_xml("Rule", rules, obj);
   }
 
-  int to_sync_policy_groups(req_state *s,
+  int to_sync_policy_groups(req_state *s, rgw::sal::RGWRadosStore *store,
                             vector<rgw_sync_policy_group> *result) const {
     result->resize(2);
 
@@ -859,7 +889,7 @@ struct ReplicationConfiguration {
     for (auto& rule : rules) {
       rgw_sync_bucket_pipes pipe;
       bool enabled;
-      int r = rule.to_sync_policy_pipe(s, &pipe, &enabled);
+      int r = rule.to_sync_policy_pipe(s, store, &pipe, &enabled);
       if (r < 0) {
         ldout(s->cct, 5) << "NOTICE: failed to convert replication configuration into sync policy pipe (rule.id=" << rule.id << "): " << cpp_strerror(-r) << dendl;
         return r;
@@ -907,7 +937,7 @@ int RGWPutBucketReplication_ObjStore_S3::get_params()
     return -ERR_MALFORMED_XML;
   }
 
-  r = conf.to_sync_policy_groups(s, &sync_policy_groups);
+  r = conf.to_sync_policy_groups(s, store, &sync_policy_groups);
   if (r < 0) {
     return r;
   }