Fix connectivity issues in Docker Swarm #270
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add config field to set ip address for node
ikopylov
reviewed
Jul 21, 2021
bob-apps/bin/bobd.rs
Outdated
| let mut addr = node.bind().to_socket_addrs().unwrap().next().unwrap(); | ||
|
|
||
| let mut addr = if let Some(addr) = node.bind_to_ip_address() { | ||
| addr |
There was a problem hiding this comment.
Sanity check is required: if bind_to_ip_address is specified and node address is also specified as ipv4 and they are different, then log error and panic
ikopylov
reviewed
Jul 21, 2021
bob-apps/bin/bobd.rs
Outdated
|
|
||
| let mut addr = if let Some(addr) = node.bind_to_ip_address() { | ||
| addr | ||
| } else if let Ok(addr) = node.bind().parse() { |
There was a problem hiding this comment.
Into what type is this string parsed?
There was a problem hiding this comment.
std::net::SocketAddr
|
@pyakushin this change is needed ASAP. Please, review it. |
idruzhitskiy
reviewed
Aug 2, 2021
bob-apps/bin/bobd.rs
Outdated
| @@ -44,8 +63,15 @@ async fn main() { | |||
| .find(|n| n.name() == name) | |||
| .unwrap_or_else(|| panic!("cannot find node: '{}' in cluster config", name)); | |||
| mapper = VirtualMapper::new(&node, &cluster).await; | |||
| addr = finded.address().to_socket_addrs().unwrap().next().unwrap(); | |||
| addr = if let Ok(addr) = finded.address().parse() { | |||
bob-apps/bin/bobd.rs
Outdated
| } | ||
| (Some(addr), _, _) => Some(addr), | ||
| (_, Ok(addr), _) => Some(addr), | ||
| (_, _, Some(port)) => Some(SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), port)), |
There was a problem hiding this comment.
SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), port) occured multiple times in the code, prob it's better to add some function for it (since it's quite a long line)
piakushin
reviewed
Aug 4, 2021
bob-apps/bin/bobd.rs
Outdated
| } | ||
| (Some(addr), _, _) => Some(addr), | ||
| (_, Ok(addr), _) => Some(addr), | ||
| (_, _, Some(port)) => Some(SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), port)), |
bob-common/src/node.rs
Outdated
| @@ -39,8 +38,7 @@ pub struct Disk { | |||
| impl Node { | |||
| pub async fn new(name: String, address: &str, index: u16) -> Self { | |||
| error!("address: [{}]", address); | |||
bob-common/src/node.rs
Outdated
| @@ -39,8 +38,7 @@ pub struct Disk { | |||
| impl Node { | |||
| pub async fn new(name: String, address: &str, index: u16) -> Self { | |||
| error!("address: [{}]", address); | |||
| let mut address = lookup_host(address).await.expect("DNS resolution failed"); | |||
| let address = address.next().expect("address is empty"); | |||
| let address = address.to_string(); | |||
There was a problem hiding this comment.
Pass address as String already because you make it owned here anyway
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #249