rgw: redo policy definitions

Still incomplete

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

diff --git a/src/rgw/rgw_sync_policy.h b/src/rgw/rgw_sync_policy.h
index 0dbc3572d68d5f1cabf6f3ce9a8fdf3dea239f8d..786964c938426281c371dda42a4bc6251c3d576c 100644 (file)
--- a/src/rgw/rgw_sync_policy.h
+++ b/src/rgw/rgw_sync_policy.h
@@ -17,7 +17,7 @@
 
 #include "rgw_common.h"
 
-
+#if 0
 struct rgw_sync_flow_directional_rule {
   string source_zone;
   string target_zone;
@@ -171,4 +171,140 @@ struct rgw_sync_policy_info {
 };
 WRITE_CLASS_ENCODER(rgw_sync_policy_info)
 
+#endif
+
+struct rgw_sync_symmetric_group {
+  std::set<string> zones;
+
+  void encode(bufferlist& bl) const {
+    ENCODE_START(1, 1, bl);
+    encode(zones, bl);
+    ENCODE_FINISH(bl);
+  }
+
+  void decode(bufferlist::const_iterator& bl) {
+    DECODE_START(1, bl);
+    decode(zones, bl);
+    DECODE_FINISH(bl);
+  }
+
+  void dump(ceph::Formatter *f) const;
+  void decode_json(JSONObj *obj);
+};
+WRITE_CLASS_ENCODER(rgw_sync_symmetric_group)
+
+struct rgw_sync_directional_rule {
+  string source_zone;
+  string target_zone;
+
+  void encode(bufferlist& bl) const {
+    ENCODE_START(1, 1, bl);
+    encode(source_zone, bl);
+    encode(target_zone, bl);
+    ENCODE_FINISH(bl);
+  }
+
+  void decode(bufferlist::const_iterator& bl) {
+    DECODE_START(1, bl);
+    decode(source_zone, bl);
+    decode(target_zone, bl);
+    DECODE_FINISH(bl);
+  }
+
+  void dump(ceph::Formatter *f) const;
+  void decode_json(JSONObj *obj);
+};
+WRITE_CLASS_ENCODER(rgw_sync_directional_rule)
+
+struct rgw_sync_bucket_entity {
+  bool wildcard{false};
+  std::optional<rgw_bucket> bucket;
+  std::optional<std::set<string> > zones;
+
+  void encode(bufferlist& bl) const {
+    ENCODE_START(1, 1, bl);
+    encode(wildcard, bl);
+    encode(bucket, bl);
+    encode(zones, bl);
+    ENCODE_FINISH(bl);
+  }
+
+  void decode(bufferlist::const_iterator& bl) {
+    DECODE_START(1, bl);
+    decode(wildcard, bl);
+    decode(bucket, bl);
+    decode(zones, bl);
+    DECODE_FINISH(bl);
+  }
+
+  void dump(ceph::Formatter *f) const;
+  void decode_json(JSONObj *obj);
+};
+WRITE_CLASS_ENCODER(rgw_sync_bucket_entity)
+
+struct rgw_sync_bucket_pipe {
+  rgw_sync_bucket_entity source;
+  rgw_sync_bucket_entity target;
+
+  void encode(bufferlist& bl) const {
+    ENCODE_START(1, 1, bl);
+    encode(source, bl);
+    encode(target, bl);
+    ENCODE_FINISH(bl);
+  }
+
+  void decode(bufferlist::const_iterator& bl) {
+    DECODE_START(1, bl);
+    decode(source, bl);
+    decode(target, bl);
+    DECODE_FINISH(bl);
+  }
+
+  void dump(ceph::Formatter *f) const;
+  void decode_json(JSONObj *obj);
+};
+WRITE_CLASS_ENCODER(rgw_sync_bucket_pipe)
+
+
+
+struct rgw_sync_policy_info {
+  /* zone data flow */
+  std::optional<std::vector<rgw_sync_symmetric_group> > symmetrical;
+  std::optional<std::vector<rgw_sync_directional_rule> > directional;
+
+  std::optional<std::vector<rgw_sync_bucket_pipe> > pipes;
+
+  void encode(bufferlist& bl) const {
+    ENCODE_START(1, 1, bl);
+    encode(symmetrical, bl);
+    encode(directional, bl);
+    encode(pipes, bl);
+    ENCODE_FINISH(bl);
+  }
+
+  void decode(bufferlist::const_iterator& bl) {
+    DECODE_START(1, bl);
+    decode(symmetrical, bl);
+    decode(directional, bl);
+    decode(pipes, bl);
+    DECODE_FINISH(bl);
+  }
+
+  void dump(ceph::Formatter *f) const;
+  void decode_json(JSONObj *obj);
+
+  template <class O>
+  bool empty_opt(O& o) const {
+    return (!o || o->empty());
+  }
+
+  bool empty() const {
+    return (empty_opt(symmetrical) &&
+            empty_opt(directional) &&
+            empty_opt(pipes));
+  }
+
+};
+WRITE_CLASS_ENCODER(rgw_sync_policy_info)
+