Skip to content

Fix server info reconciler not restarting after an error#47160

Merged
atburke merged 1 commit intomasterfrom
atburke/server-info-retry
Oct 10, 2024
Merged

Fix server info reconciler not restarting after an error#47160
atburke merged 1 commit intomasterfrom
atburke/server-info-retry

Conversation

@atburke
Copy link
Copy Markdown
Contributor

@atburke atburke commented Oct 3, 2024

This change fixes the server info reconciler to restart on an error.

Fixes #44793.

Changelog: Fixed the resource-based labels handler crashing without restarting

Comment thread lib/auth/server_info.go
const timeBetweenReconciliationLoops = 10 * time.Minute
clock := a.GetClock()
func ReconcileServerInfos(ctx context.Context, ap ServerInfoAccessPoint) error {
retry, err := retryutils.NewLinear(retryutils.LinearConfig{
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does retry need any sort of defer to stop it when this function returns?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't have a Close() method and it doesn't have any internal things to cancel, so I don't think so.

@atburke atburke requested a review from rosstimothy October 8, 2024 18:04
@atburke
Copy link
Copy Markdown
Contributor Author

atburke commented Oct 9, 2024

Friendly ping @rosstimothy

@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from tcsc October 9, 2024 19:44
This change fixes the server info reconciler to restart on an error.
@atburke atburke force-pushed the atburke/server-info-retry branch from dae720d to f06454b Compare October 9, 2024 23:34
@atburke atburke enabled auto-merge October 9, 2024 23:34
@atburke atburke added this pull request to the merge queue Oct 9, 2024
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 10, 2024
@rosstimothy rosstimothy added this pull request to the merge queue Oct 10, 2024
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 10, 2024
@atburke atburke added this pull request to the merge queue Oct 10, 2024
Merged via the queue into master with commit 16f0927 Oct 10, 2024
@atburke atburke deleted the atburke/server-info-retry branch October 10, 2024 16:50
@public-teleport-github-review-bot
Copy link
Copy Markdown

@atburke See the table below for backport results.

Branch Result
branch/v14 Failed
branch/v15 Create PR
branch/v16 Create PR

mvbrock pushed a commit that referenced this pull request Oct 16, 2024
This change fixes the server info reconciler to restart on an error.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

The server info reconciler can fail without recovering

4 participants