Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cleanup in node_pool & token_map #890

Merged
merged 3 commits into from Oct 31, 2022
Merged

cleanup in node_pool & token_map #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd50c84
cleanup
conorbros Oct 27, 2022
3357e42
Merge branch 'main' into cleanup
conorbros Oct 28, 2022
b80e6a8
Merge branch 'main' into cleanup
rukai Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
162 changes: 106 additions & 56 deletions shotover-proxy/src/transforms/cassandra/sink_cluster/node_pool.rs
View file
Open in desktop
Expand Up @@ -138,60 +138,7 @@ impl NodePool {
mod test_node_pool {
use super::*;
use crate::transforms::cassandra::sink_cluster::CassandraNode;
use uuid::uuid;

fn prepare_nodes() -> Vec<CassandraNode> {
vec![
CassandraNode::new(
"172.16.1.0:9044".parse().unwrap(),
"rack1".into(),
vec![],
uuid!("2dd022d6-2937-4754-89d6-02d2933a8f7a"),
),
CassandraNode::new(
"172.16.1.1:9044".parse().unwrap(),
"rack1".into(),
vec![],
uuid!("2dd022d6-2937-4754-89d6-02d2933a8f7b"),
),
CassandraNode::new(
"172.16.1.2:9044".parse().unwrap(),
"rack1".into(),
vec![],
uuid!("2dd022d6-2937-4754-89d6-02d2933a8f7c"),
),
CassandraNode::new(
"172.16.1.3:9044".parse().unwrap(),
"rack1".into(),
vec![],
uuid!("2dd022d6-2937-4754-89d6-02d2933a8f7c"),
),
CassandraNode::new(
"172.16.1.4:9044".parse().unwrap(),
"rack1".into(),
vec![],
uuid!("2dd022d6-2937-4754-89d6-02d2933a8f7c"),
),
CassandraNode::new(
"172.16.1.5:9044".parse().unwrap(),
"rack1".into(),
vec![],
uuid!("2dd022d6-2937-4754-89d6-02d2933a8f7d"),
),
CassandraNode::new(
"172.16.1.6:9044".parse().unwrap(),
"rack1".into(),
vec![],
uuid!("2dd022d6-2937-4754-89d6-02d2933a8f7e"),
),
CassandraNode::new(
"172.16.1.7:9044".parse().unwrap(),
"rack1".into(),
vec![],
uuid!("2dd022d6-2937-4754-89d6-02d2933a8f7f"),
),
]
}
use uuid::Uuid;

#[test]
fn test_round_robin() {
Expand All @@ -205,7 +152,7 @@ mod test_node_pool {

let mut round_robin_nodes = vec![];

for _ in 0..nodes.len() - 1 {
for _ in 0..nodes.iter().filter(|node| node.rack == "rack1").count() - 1 {
round_robin_nodes.push(
node_pool
.get_round_robin_node_in_dc_rack("rack1")
Expand Down Expand Up @@ -234,7 +181,7 @@ mod test_node_pool {

round_robin_nodes.clear();

for _ in 0..nodes.len() - 1 {
for _ in 0..nodes.iter().filter(|node| node.rack == "rack1").count() - 1 {
round_robin_nodes.push(
node_pool
.get_round_robin_node_in_dc_rack("rack1")
Expand All @@ -257,4 +204,107 @@ mod test_node_pool {
round_robin_nodes
);
}

fn prepare_nodes() -> Vec<CassandraNode> {
vec![
// rack 1 nodes
CassandraNode::new(
"172.16.1.0:9044".parse().unwrap(),
"rack1".into(),
vec![],
Uuid::new_v4(),
),
CassandraNode::new(
"172.16.1.1:9044".parse().unwrap(),
"rack1".into(),
vec![],
Uuid::new_v4(),
),
CassandraNode::new(
"172.16.1.2:9044".parse().unwrap(),
"rack1".into(),
vec![],
Uuid::new_v4(),
),
CassandraNode::new(
"172.16.1.3:9044".parse().unwrap(),
"rack1".into(),
vec![],
Uuid::new_v4(),
),
CassandraNode::new(
"172.16.1.4:9044".parse().unwrap(),
"rack1".into(),
vec![],
Uuid::new_v4(),
),
CassandraNode::new(
"172.16.1.5:9044".parse().unwrap(),
"rack1".into(),
vec![],
Uuid::new_v4(),
),
CassandraNode::new(
"172.16.1.6:9044".parse().unwrap(),
"rack1".into(),
vec![],
Uuid::new_v4(),
),
CassandraNode::new(
"172.16.1.7:9044".parse().unwrap(),
"rack1".into(),
vec![],
Uuid::new_v4(),
),
// rack 2 nodes
CassandraNode::new(
"172.16.2.0:9044".parse().unwrap(),
"rack2".into(),
vec![],
Uuid::new_v4(),
),
CassandraNode::new(
"172.16.2.1:9044".parse().unwrap(),
"rack2".into(),
vec![],
Uuid::new_v4(),
),
CassandraNode::new(
"172.16.2.2:9044".parse().unwrap(),
"rack2".into(),
vec![],
Uuid::new_v4(),
),
CassandraNode::new(
"172.16.2.3:9044".parse().unwrap(),
"rack2".into(),
vec![],
Uuid::new_v4(),
),
CassandraNode::new(
"172.16.2.4:9044".parse().unwrap(),
"rack2".into(),
vec![],
Uuid::new_v4(),
),
CassandraNode::new(
"172.16.2.5:9044".parse().unwrap(),
"rack2".into(),
vec![],
Uuid::new_v4(),
),
CassandraNode::new(
"172.16.2.6:9044".parse().unwrap(),
"rack2".into(),
vec![],
Uuid::new_v4(),
),
CassandraNode::new(
"172.16.2.7:9044".parse().unwrap(),
"rack2".into(),
vec![],
Uuid::new_v4(),
),
]
}
}
6 changes: 3 additions & 3 deletions shotover-proxy/src/transforms/cassandra/sink_cluster/token_map.rs
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@ mod test_token_map {
vec![
CassandraNode::new(
"127.0.0.1:9042".parse().unwrap(),
"dc1".into(),
"rack1".into(),
vec![
Murmur3Token::new(-2),
Murmur3Token::new(-1),
Expand All @@ -57,13 +57,13 @@ mod test_token_map {
),
CassandraNode::new(
"127.0.0.1:9043".parse().unwrap(),
"dc1".into(),
"rack1".into(),
vec![Murmur3Token::new(20)],
NODE_2,
),
CassandraNode::new(
"127.0.0.1:9044".parse().unwrap(),
"dc1".into(),
"rack1".into(),
vec![
Murmur3Token::new(2),
Murmur3Token::new(1),
Expand Down