-
Notifications
You must be signed in to change notification settings - Fork 308
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: wrong frontend registration address (#4199)
* fix: frontend registration address is wrong, #4186 * fix: license header * chore: adds hostname to frontend grpc * fix: forgot run make config-docs * chore: warn when using bind_addr * fix: flow node heartbeat carrying address
- Loading branch information
1 parent
948c869
commit a779cb3
Showing
8 changed files
with
78 additions
and
53 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
// Copyright 2023 Greptime Team | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
use common_telemetry::warn; | ||
|
||
/// Resolves hostname:port address for meta registration. | ||
/// If `hostname_addr` is present, prefer to use it, `bind_addr` otherwise. | ||
pub fn resolve_addr(bind_addr: &str, hostname_addr: Option<&str>) -> String { | ||
match hostname_addr { | ||
Some(hostname_addr) => { | ||
// it has port configured | ||
if hostname_addr.contains(':') { | ||
hostname_addr.to_string() | ||
} else { | ||
// otherwise, resolve port from bind_addr | ||
// should be safe to unwrap here because bind_addr is already validated | ||
let port = bind_addr.split(':').nth(1).unwrap(); | ||
format!("{hostname_addr}:{port}") | ||
} | ||
} | ||
None => { | ||
warn!("hostname not set, using bind_addr: {bind_addr} instead."); | ||
bind_addr.to_string() | ||
} | ||
} | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
#[test] | ||
fn test_resolve_addr() { | ||
assert_eq!( | ||
"tomcat:3001", | ||
super::resolve_addr("127.0.0.1:3001", Some("tomcat")) | ||
); | ||
|
||
assert_eq!( | ||
"tomcat:3002", | ||
super::resolve_addr("127.0.0.1:3001", Some("tomcat:3002")) | ||
); | ||
|
||
assert_eq!( | ||
"127.0.0.1:3001", | ||
super::resolve_addr("127.0.0.1:3001", None) | ||
); | ||
} | ||
} |
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