Skip to content

[v11] Fix cluster alerts timeout#25301

Merged
zmb3 merged 1 commit intobranch/v11from
bot/backport-25261-branch/v11
Apr 28, 2023
Merged

[v11] Fix cluster alerts timeout#25301
zmb3 merged 1 commit intobranch/v11from
bot/backport-25261-branch/v11

Conversation

@zmb3
Copy link
Copy Markdown
Collaborator

@zmb3 zmb3 commented Apr 27, 2023

Backport #25261 to branch/v11

tsh shows clusters alerts for both `tsh login` and `tsh status`.
We intentionally used a short (500ms) timeout to avoid slowing down
`tsh status` which was previously an "offline" command.

As a side effect, cluster alerts would not always show on login if
they took longer than 500ms to fetch.

This change ensures that we always wait for cluster alerts to come
back for `tsh login`, but we still enforce a short timeout for the
`tsh status` command. (The timeout was increased slightly since the
context now wraps the entire command and not just the cluster alerts
call)

Fixes #25239
@github-actions github-actions Bot added backport size/sm tctl tctl - Teleport admin tool tsh tsh - Teleport's command line tool for logging into nodes running Teleport. labels Apr 27, 2023
@zmb3 zmb3 added this pull request to the merge queue Apr 28, 2023
Merged via the queue into branch/v11 with commit 4d1f887 Apr 28, 2023
@zmb3 zmb3 deleted the bot/backport-25261-branch/v11 branch April 28, 2023 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport size/sm tctl tctl - Teleport admin tool tsh tsh - Teleport's command line tool for logging into nodes running Teleport.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants