Skip to content

[v13] Fix cluster alerts timeout#25299

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

[v13] Fix cluster alerts timeout#25299
zmb3 merged 1 commit intobranch/v13from
bot/backport-25261-branch/v13

Conversation

@zmb3
Copy link
Copy Markdown
Collaborator

@zmb3 zmb3 commented Apr 27, 2023

Backport #25261 to branch/v13

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 requested a review from ibeckermayer April 27, 2023 22:33
@github-actions github-actions Bot added tctl tctl - Teleport admin tool tsh tsh - Teleport's command line tool for logging into nodes running Teleport. labels Apr 27, 2023
@github-actions github-actions Bot requested a review from rosstimothy April 27, 2023 22:33
@zmb3 zmb3 added this pull request to the merge queue Apr 28, 2023
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Apr 28, 2023
@zmb3 zmb3 added this pull request to the merge queue Apr 28, 2023
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Apr 28, 2023
@zmb3 zmb3 added this pull request to the merge queue Apr 28, 2023
Merged via the queue into branch/v13 with commit 18e0bee Apr 28, 2023
@zmb3 zmb3 deleted the bot/backport-25261-branch/v13 branch April 28, 2023 16:42
@r0mant r0mant mentioned this pull request Jul 14, 2023
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