From 820a81130e1152d3557fab95923a85fdcbd3768e Mon Sep 17 00:00:00 2001
From: Dominik Werder <dominik.werder@gmail.com>
Date: Thu, 15 May 2025 14:11:26 +0200
Subject: [PATCH] Reduce scylla conn count

---
 netfetch/src/ca/conn.rs |  1 -
 scywr/src/session.rs    | 10 +++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/netfetch/src/ca/conn.rs b/netfetch/src/ca/conn.rs
index f842fb9..daf78cc 100644
--- a/netfetch/src/ca/conn.rs
+++ b/netfetch/src/ca/conn.rs
@@ -24,7 +24,6 @@ use netpod::TsMs;
 use netpod::TsNano;
 use netpod::channelstatus::ChannelStatus;
 use netpod::channelstatus::ChannelStatusClosedReason;
-use netpod::timeunits::*;
 use netpod::ttl::RetentionTime;
 use proto::CaDataValue;
 use proto::CaEventValue;
diff --git a/scywr/src/session.rs b/scywr/src/session.rs
index e366b4f..52406f3 100644
--- a/scywr/src/session.rs
+++ b/scywr/src/session.rs
@@ -6,7 +6,10 @@ use scylla::client::PoolSize;
 use scylla::client::execution_profile::ExecutionProfileBuilder;
 use scylla::client::session_builder::GenericSessionBuilder;
 use scylla::errors::NewSessionError;
+use scylla::routing::ShardAwarePortRange;
 use scylla::statement::Consistency;
+use std::num::NonZero;
+use std::ops::RangeInclusive;
 use std::sync::Arc;
 
 autoerr::create_error_v1!(
@@ -27,8 +30,13 @@ pub async fn create_session_no_ks(scyconf: &ScyllaIngestConfig) -> Result<Arc<Se
         .consistency(Consistency::LocalOne)
         .build()
         .into_handle();
+    let port_range: RangeInclusive<u16> = 32000u16..=36000u16;
+    let _port_range = ShardAwarePortRange::new(port_range).unwrap();
     let scy = GenericSessionBuilder::new()
-        .pool_size(PoolSize::default())
+        // .disallow_shard_aware_port(true)
+        // .shard_aware_local_port_range(port_range)
+        // .pool_size(PoolSize::default())
+        .pool_size(PoolSize::PerHost(NonZero::new(1).unwrap()))
         .known_nodes(scyconf.hosts())
         .default_execution_profile_handle(profile)
         .write_coalescing(true)