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

node: tiny optimizations and code refactors #1108

Merged
merged 4 commits into from
Oct 26, 2024
Merged

node: tiny optimizations and code refactors #1108

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6b313d
node: remove needless clone in `resolve_contact_points`
muzarski Oct 25, 2024
104236b
node: don't allocate vector during hostname resolution
muzarski Oct 25, 2024
113f500
node: adjust `resolve_hostname` to functional programming
muzarski Oct 25, 2024
81d9576
refiller: remove needless `has_connections()` method
muzarski Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions scylla/src/transport/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use itertools::Itertools;
use tokio::net::lookup_host;
use tracing::warn;
use uuid::Uuid;
Expand Down Expand Up @@ -270,7 +271,6 @@ pub(crate) struct ResolvedContactPoint {
// The resolution may return multiple IPs and the function returns one of them.
// It prefers to return IPv4s first, and only if there are none, IPv6s.
pub(crate) async fn resolve_hostname(hostname: &str) -> Result<SocketAddr, io::Error> {
let mut ret = None;
let addrs = match lookup_host(hostname).await {
Ok(addrs) => itertools::Either::Left(addrs),
// Use a default port in case of error, but propagate the original error on failure
Expand All @@ -279,21 +279,15 @@ pub(crate) async fn resolve_hostname(hostname: &str) -> Result<SocketAddr, io::E
itertools::Either::Right(addrs)
}
};
for a in addrs {
match a {
SocketAddr::V4(_) => return Ok(a),
_ => {
ret = Some(a);
}
}
}

ret.ok_or_else(|| {
io::Error::new(
io::ErrorKind::Other,
format!("Empty address list returned by DNS for {}", hostname),
)
})
addrs
.find_or_last(|addr| matches!(addr, SocketAddr::V4(_)))
.ok_or_else(|| {
io::Error::new(
io::ErrorKind::Other,
format!("Empty address list returned by DNS for {}", hostname),
)
})
Comment on lines +283 to +290
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any ideas BTW why we're biased for IPv4 addresses???

}

/// Transforms the given [`InternalKnownNode`]s into [`ContactPoint`]s.
Expand Down