KafkaSinkCluster benches

shotover · Nov 28, 2023 · 4764d7a · 4764d7a
1 parent f4fde8a
commit 4764d7a
Show file tree

Hide file tree

Showing 4 changed files with 215 additions and 71 deletions.
diff --git a/shotover-proxy/benches/windsock/cassandra.rs b/shotover-proxy/benches/windsock/cassandra.rs
@@ -1,6 +1,6 @@
 use crate::{
     aws::{Ec2InstanceWithDocker, Ec2InstanceWithShotover, RunningShotover},
-    common::{self, Shotover},
+    common::{self, Shotover, Topology},
     profilers::{self, CloudProfilerRunner, ProfilerRunner},
 };
 use anyhow::Result;
@@ -74,12 +74,6 @@ enum CassandraDbInstance {
     Mocked(MockHandle),
 }
 
-#[derive(Clone, PartialEq)]
-pub enum Topology {
-    Single,
-    Cluster3,
-}
-
 struct CoreCount {
     /// Cores to be assigned to the bench's tokio runtime
     bench: usize,
@@ -455,13 +449,7 @@ impl Bench for CassandraBench {
                     CassandraDb::Mocked => "cassandra-mocked".to_owned(),
                 },
             ),
-            (
-                "topology".to_owned(),
-                match &self.topology {
-                    Topology::Single => "single".to_owned(),
-                    Topology::Cluster3 => "cluster3".to_owned(),
-                },
-            ),
+            self.topology.to_tag(),
             self.shotover.to_tag(),
             (
                 "operation".to_owned(),
@@ -564,7 +552,7 @@ impl Bench for CassandraBench {
         ];
 
         let (_, running_shotover) = futures::join!(
-            run_aws_cassandra(cassandra_nodes, self.topology.clone()),
+            run_aws_cassandra(cassandra_nodes, self.topology),
             self.run_aws_shotover(shotover_instance.clone(), cassandra_ip.clone(),)
         );
 

diff --git a/shotover-proxy/benches/windsock/common.rs b/shotover-proxy/benches/windsock/common.rs
@@ -1,4 +1,4 @@
-use shotover::{config::topology::Topology, sources::SourceConfig};
+use shotover::{config::topology::Topology as ShotoverTopology, sources::SourceConfig};
 
 #[derive(Clone, Copy)]
 pub enum Shotover {
@@ -20,8 +20,26 @@ impl Shotover {
     }
 }
 
+#[derive(Clone, Copy, PartialEq)]
+pub enum Topology {
+    Single,
+    Cluster3,
+}
+
+impl Topology {
+    pub fn to_tag(self) -> (String, String) {
+        (
+            "topology".to_owned(),
+            match self {
+                Topology::Single => "single".to_owned(),
+                Topology::Cluster3 => "cluster3".to_owned(),
+            },
+        )
+    }
+}
+
 pub fn generate_topology(source: SourceConfig) -> String {
-    Topology {
+    ShotoverTopology {
         sources: vec![source],
     }
     .serialize()