Skip to content

Commit

Permalink
cherry pick #8016 to release-4.0
Browse files Browse the repository at this point in the history
Signed-off-by: linning <linningde25@gmail.com>
  • Loading branch information
NingLin-P committed Jun 5, 2020
1 parent 146a1f9 commit 21a31be
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 16 deletions.
16 changes: 8 additions & 8 deletions src/server/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -198,19 +198,19 @@ impl Config {
box_try!(config::check_addr(&self.status_addr));
if !self.advertise_status_addr.is_empty() {
box_try!(config::check_addr(&self.advertise_status_addr));
if self.advertise_status_addr.starts_with("0.0.0.0") {
return Err(box_err!(
"invalid advertise-status-addr: {:?}",
self.advertise_status_addr
));
}
} else {
info!(
"no advertise-status-addr is specified, falling back to status-addr";
"status-addr" => %self.status_addr
);
self.advertise_status_addr = self.status_addr.clone();
}
if self.advertise_status_addr.starts_with("0.0.0.0") {
return Err(box_err!(
"invalid advertise-status-addr: {:?}",
self.advertise_status_addr
));
}
}
if self.advertise_status_addr == self.advertise_addr {
return Err(box_err!(
Expand Down Expand Up @@ -339,9 +339,9 @@ mod tests {

invalid_cfg = Config::default();
invalid_cfg.status_addr = "0.0.0.0:1000".to_owned();
assert!(invalid_cfg.validate().is_err());
invalid_cfg.advertise_status_addr = "127.0.0.1:1000".to_owned();
invalid_cfg.validate().unwrap();
invalid_cfg.advertise_status_addr = "0.0.0.0:1000".to_owned();
assert!(invalid_cfg.validate().is_err());

let mut invalid_cfg = cfg.clone();
invalid_cfg.advertise_addr = "127.0.0.1:1000".to_owned();
Expand Down
22 changes: 14 additions & 8 deletions src/server/status_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -609,16 +609,19 @@ impl StatusServer {
self.advertise_addr = Some(advertise_addr);
return;
}
Ok(resp) => error!("failed to register addr to pd"; "response" => ?resp),
Err(e) => error!("failed to register addr to pd"; "error" => ?e),
Ok(resp) => {
let status = resp.status();
warn!("failed to register addr to pd"; "status code" => status.as_str(), "body" => ?resp.text());
}
Err(e) => warn!("failed to register addr to pd"; "error" => ?e),
}
}
// refresh the pd leader
if let Err(e) = pd_client.reconnect() {
error!("failed to reconnect pd client"; "err" => ?e);
warn!("failed to reconnect pd client"; "err" => ?e);
}
}
error!(
warn!(
"failed to register addr to pd after {} tries",
COMPONENT_REQUEST_RETRY
);
Expand All @@ -642,16 +645,19 @@ impl StatusServer {
self.advertise_addr = None;
return;
}
Ok(resp) => error!("failed to unregister addr to pd"; "response" => ?resp),
Err(e) => error!("failed to unregister addr to pd"; "error" => ?e),
Ok(resp) => {
let status = resp.status();
warn!("failed to unregister addr to pd"; "status code" => status.as_str(), "body" => ?resp.text());
}
Err(e) => warn!("failed to unregister addr to pd"; "error" => ?e),
}
}
// refresh the pd leader
if let Err(e) = pd_client.reconnect() {
error!("failed to reconnect pd client"; "err" => ?e);
warn!("failed to reconnect pd client"; "err" => ?e);
}
}
error!(
warn!(
"failed to unregister addr to pd after {} tries",
COMPONENT_REQUEST_RETRY
);
Expand Down

0 comments on commit 21a31be

Please sign in to comment.