Skip to content

Ensure that DNS errors in desktop discovery fail fast#30979

Merged
zmb3 merged 1 commit intomasterfrom
zmb3/discovery-fix
Aug 25, 2023
Merged

Ensure that DNS errors in desktop discovery fail fast#30979
zmb3 merged 1 commit intomasterfrom
zmb3/discovery-fix

Conversation

@zmb3
Copy link
Copy Markdown
Collaborator

@zmb3 zmb3 commented Aug 24, 2023

In #30277 we made the discovery process make two DNS queries in parallel. There was an error in this logic - since we don't write to the channel on error, if both queries fail we end up waiting a full 5 seconds even if the failures occur much quicker than that.

Changelog: Fix a regression with desktop discovery that could cause desktops to expire in environments with large numbers of desktops.

Comment thread lib/srv/desktop/discovery_test.go Outdated
@zmb3 zmb3 added the changelog label Aug 24, 2023
Comment thread lib/srv/desktop/discovery.go Outdated
Comment thread lib/srv/desktop/discovery.go Outdated
Comment thread lib/srv/desktop/discovery_test.go Outdated
@zmb3 zmb3 force-pushed the zmb3/discovery-fix branch from f52727f to 811d615 Compare August 24, 2023 18:29
Comment thread lib/srv/desktop/discovery.go Outdated
In #30277 we made the discovery process make two DNS queries
in parallel. There was an error in this logic - since we don't
write to the channel on error, if both queries fail we end up
waiting a full 5 seconds even if the failures occur much quicker
than that.
@zmb3 zmb3 force-pushed the zmb3/discovery-fix branch from 811d615 to 483f5a2 Compare August 24, 2023 19:50
@zmb3 zmb3 added this pull request to the merge queue Aug 25, 2023
Merged via the queue into master with commit a417d3a Aug 25, 2023
@zmb3 zmb3 deleted the zmb3/discovery-fix branch August 25, 2023 16:15
@public-teleport-github-review-bot
Copy link
Copy Markdown

@zmb3 See the table below for backport results.

Branch Result
branch/v11 Create PR
branch/v12 Create PR
branch/v13 Create PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants