Skip to content

dnsdist-2.1: Backport 17381 - Fix DownstreamState::setHealthCheckParams #17413

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

Merged
rgacogne merged 3 commits into from
May 21, 2026
+11 −8
Merged

dnsdist-2.1: Backport 17381 - Fix DownstreamState::setHealthCheckParams #17413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1450794
dnsdist: Fix DownstreamState::setHealthCheckParams
rgacogne May 15, 2026
0e9f648
dnsdist: Fix a bug caught by clang-tidy
rgacogne May 15, 2026
2b33431
dnsdist: Hopefully fixes spurious failures of TestHealthCheckLatency
rgacogne May 18, 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
12 changes: 4 additions & 8 deletions pdns/dnsdistdist/dnsdist-lua-bindings.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,20 +293,16 @@ void setupLuaBindings(LuaContext& luaCtx, bool client, bool configCheck)
return;
}
size_t value = 0;
getOptionalValue<size_t>(vars, "maxCheckFailures", value);
if (value > 0) {
if (getOptionalValue<size_t>(vars, "maxCheckFailures", value) > 0 && value > 0) {
state->d_config.maxCheckFailures.store(value);
}
getOptionalValue<size_t>(vars, "rise", value);
if (value > 0) {
if (getOptionalValue<size_t>(vars, "rise", value) > 0 && value > 0) {
state->d_config.minRiseSuccesses.store(value);
}
getOptionalValue<size_t>(vars, "checkTimeout", value);
if (value > 0) {
if (getOptionalValue<size_t>(vars, "checkTimeout", value) > 0 && value > 0) {
state->d_config.checkTimeout.store(value);
}
getOptionalValue<size_t>(vars, "checkInterval", value);
if (value > 0) {
if (getOptionalValue<size_t>(vars, "checkInterval", value) > 0 && value > 0) {
state->d_config.checkInterval.store(value);
}
});
Expand Down
7 changes: 7 additions & 0 deletions regression-tests.dnsdist/test_HealthChecks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,13 @@ def testLatency(self):
# introduce 500 ms of latency
self.setDelay(0.5)

# consume any value received in the meantime (it does happen on GH actions runners)
try:
while self.wait1(False):
pass
except queue.Empty:
pass

self.wait1(True)

# should have no failures, still up
Expand Down
Loading