Merge branch 'main' into cdrs-tokio-integration

shotover · Aug 26, 2022 · b487625 · b487625
2 parents ad8f732 + d88886f
commit b487625
Show file tree

Hide file tree

Showing 10 changed files with 462 additions and 117 deletions.
diff --git a/shotover-proxy/example-configs/cassandra-cluster-multi-rack/topology_rack1.yaml b/shotover-proxy/example-configs/cassandra-cluster-multi-rack/topology_rack1.yaml
@@ -7,8 +7,19 @@ chain_config:
  main_chain:
  - CassandraSinkCluster:
  first_contact_points: ["172.16.1.2:9042", "172.16.1.3:9042"]
- data_center: "dc1"
- rack: "rack1"
- host_id: "2dd022d6-2937-4754-89d6-02d2933a8f7a"
+ local_shotover_host_id: "2dd022d6-2937-4754-89d6-02d2933a8f7a"
+ shotover_nodes:
+ - address: "127.0.0.1:9042"
+ data_center: "dc1"
+ rack: "rack1"
+ host_id: "2dd022d6-2937-4754-89d6-02d2933a8f7a"
+ - address: "127.0.0.2:9042"
+ data_center: "dc1"
+ rack: "rack2"
+ host_id: "3c3c4e2d-ba74-4f76-b52e-fb5bcee6a9f4"
+ - address: "127.0.0.3:9042"
+ data_center: "dc1"
+ rack: "rack3"
+ host_id: "fa74d7ec-1223-472b-97de-04a32ccdb70b"
 source_to_chain_mapping:
  cassandra_prod: main_chain
diff --git a/shotover-proxy/example-configs/cassandra-cluster-multi-rack/topology_rack2.yaml b/shotover-proxy/example-configs/cassandra-cluster-multi-rack/topology_rack2.yaml
@@ -7,8 +7,19 @@ chain_config:
  main_chain:
  - CassandraSinkCluster:
  first_contact_points: ["172.16.1.2:9042", "172.16.1.3:9042"]
- data_center: "dc1"
- rack: "rack2"
- host_id: "3c3c4e2d-ba74-4f76-b52e-fb5bcee6a9f4"
+ local_shotover_host_id: "3c3c4e2d-ba74-4f76-b52e-fb5bcee6a9f4"
+ shotover_nodes:
+ - address: "127.0.0.1:9042"
+ data_center: "dc1"
+ rack: "rack1"
+ host_id: "2dd022d6-2937-4754-89d6-02d2933a8f7a"
+ - address: "127.0.0.2:9042"
+ data_center: "dc1"
+ rack: "rack2"
+ host_id: "3c3c4e2d-ba74-4f76-b52e-fb5bcee6a9f4"
+ - address: "127.0.0.3:9042"
+ data_center: "dc1"
+ rack: "rack3"
+ host_id: "fa74d7ec-1223-472b-97de-04a32ccdb70b"
 source_to_chain_mapping:
  cassandra_prod: main_chain
diff --git a/shotover-proxy/example-configs/cassandra-cluster-multi-rack/topology_rack3.yaml b/shotover-proxy/example-configs/cassandra-cluster-multi-rack/topology_rack3.yaml
@@ -7,8 +7,19 @@ chain_config:
  main_chain:
  - CassandraSinkCluster:
  first_contact_points: ["172.16.1.2:9042", "172.16.1.3:9042"]
- data_center: "dc1"
- rack: "rack3"
- host_id: "fa74d7ec-1223-472b-97de-04a32ccdb70b"
+ local_shotover_host_id: "fa74d7ec-1223-472b-97de-04a32ccdb70b"
+ shotover_nodes:
+ - address: "127.0.0.1:9042"
+ data_center: "dc1"
+ rack: "rack1"
+ host_id: "2dd022d6-2937-4754-89d6-02d2933a8f7a"
+ - address: "127.0.0.2:9042"
+ data_center: "dc1"
+ rack: "rack2"
+ host_id: "3c3c4e2d-ba74-4f76-b52e-fb5bcee6a9f4"
+ - address: "127.0.0.3:9042"
+ data_center: "dc1"
+ rack: "rack3"
+ host_id: "fa74d7ec-1223-472b-97de-04a32ccdb70b"
 source_to_chain_mapping:
  cassandra_prod: main_chain
diff --git a/shotover-proxy/example-configs/cassandra-cluster-tls/topology.yaml b/shotover-proxy/example-configs/cassandra-cluster-tls/topology.yaml
@@ -11,9 +11,13 @@ chain_config:
  main_chain:
  - CassandraSinkCluster:
  first_contact_points: ["172.16.1.2:9042", "172.16.1.3:9042"]
- data_center: "dc1"
- rack: "rack1"
  host_id: "2dd022d6-2937-4754-89d6-02d2933a8f7a"
+ local_shotover_host_id: "2dd022d6-2937-4754-89d6-02d2933a8f7a"
+ shotover_nodes:
+ - address: "127.0.0.1:9042"
+ data_center: "dc1"
+ rack: "rack1"
+ host_id: "2dd022d6-2937-4754-89d6-02d2933a8f7a"
  tls:
  certificate_authority_path: "example-configs/cassandra-tls/certs/localhost_CA.crt"
  certificate_path: "example-configs/cassandra-tls/certs/localhost.crt"

diff --git a/shotover-proxy/example-configs/cassandra-cluster/topology-dummy-peers.yaml b/shotover-proxy/example-configs/cassandra-cluster/topology-dummy-peers.yaml
@@ -0,0 +1,29 @@
+---
+sources:
+ cassandra_prod:
+ Cassandra:
+ listen_addr: "127.0.0.1:9042"
+chain_config:
+ main_chain:
+ - CassandraSinkCluster:
+ first_contact_points: ["172.16.1.2:9042", "172.16.1.3:9042"]
+ local_shotover_host_id: "2dd022d6-2937-4754-89d6-02d2933a8f7a"
+ shotover_nodes:
+ - address: "127.0.0.1:9042"
+ data_center: "dc1"
+ rack: "rack1"
+ host_id: "2dd022d6-2937-4754-89d6-02d2933a8f7a"
+ # These extra nodes dont really make sense, its pointing at the same address as the local shotover node.
+ # It is however useful for testing the functionality of the system.peers rewriting.
+ # We can make stronger assertions against the values returned by system.peers with this config because
+ # more system.peers fields are static due to always being queried against this one shotover instance.
+ - address: "127.0.0.1:9042"
+ data_center: "dc1"
+ rack: "rack1"
+ host_id: "3c3c4e2d-ba74-4f76-b52e-fb5bcee6a9f4"
+ - address: "127.0.0.1:9042"
+ data_center: "dc1"
+ rack: "rack1"
+ host_id: "fa74d7ec-1223-472b-97de-04a32ccdb70b"
+source_to_chain_mapping:
+ cassandra_prod: main_chain
diff --git a/shotover-proxy/example-configs/cassandra-cluster/topology.yaml b/shotover-proxy/example-configs/cassandra-cluster/topology.yaml
@@ -7,8 +7,12 @@ chain_config:
  main_chain:
  - CassandraSinkCluster:
  first_contact_points: ["172.16.1.2:9042", "172.16.1.3:9042"]
- data_center: "dc1"
- rack: "rack1"
- host_id: "2dd022d6-2937-4754-89d6-02d2933a8f7a"
+ local_shotover_host_id: "2dd022d6-2937-4754-89d6-02d2933a8f7a"
+ shotover_nodes:
+ - address: "127.0.0.1:9042"
+ data_center: "dc1"
+ rack: "rack1"
+ host_id: "2dd022d6-2937-4754-89d6-02d2933a8f7a"
+
 source_to_chain_mapping:
  cassandra_prod: main_chain