Skip to content

fix: exit probe task promptly when client is dropped #71

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

Open
BugenZhao wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: exit probe task promptly when client is dropped #71

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
109c6f4
probe: exit when balance channel closed
BugenZhao Feb 4, 2026
e2946ce
remove unnecessary
BugenZhao Feb 4, 2026
3989311
Merge remote-tracking branch 'origin/main' into bz/0.8.2-probe-close
BugenZhao Feb 4, 2026
fa49ef6
return error instead
BugenZhao Feb 4, 2026
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
20 changes: 17 additions & 3 deletions ginepro/src/service_probe.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,22 @@ impl<Lookup: LookupService> GrpcServiceProbe<Lookup> {
}

/// Start probing the provided `hostname` for IP address changes.
/// The function will error if the receiving end of the tonic balance channel
/// is closed, e.g, the client has been deconstructed.
/// The probe loop exits once the receiving end of the tonic balance channel is closed,
/// e.g. when the client has been dropped.
/// Any other errors are seen as transient, and therefore retried after `self.probe_interval`.
pub async fn probe(mut self) -> Result<(), anyhow::Error> {
let client_closed_err = || {
anyhow::anyhow!(
"The gRPC client has closed the channel therefore the DNS probe loop will exit."
)
};

loop {
// If the receiver is already gone (e.g. client dropped), exit promptly.
if self.endpoint_reporter.is_closed() {
return Err(client_closed_err());
}

self.probe_once().await.or_else(|err| {
// Only terminate if the changeset channel has been closed.
if let ProbeError::ChangesetSenderClosed(_) = err {
Expand All @@ -107,7 +118,10 @@ impl<Lookup: LookupService> GrpcServiceProbe<Lookup> {
}
})?;

tokio::time::sleep(self.probe_interval).await;
tokio::select! {
_ = self.endpoint_reporter.closed() => return Err(client_closed_err()),
_ = tokio::time::sleep(self.probe_interval) => {},
}
}
}

Expand Down