Skip to content
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.

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

chore: download then extract in separate steps #13202

Merged
merged 5 commits into from
Jun 21, 2024
Merged

Conversation

slim-bean
Copy link
Collaborator

handle error

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@slim-bean slim-bean requested a review from a team as a code owner June 12, 2024 10:31
@pull-request-size pull-request-size bot added size/M and removed size/S labels Jun 12, 2024
Copy link
Contributor

@chaudum chaudum left a comment

Choose a reason for hiding this comment

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

Should we also backport to k206/k207?

@@ -22,6 +24,9 @@ func (m *mtxWithReadiness) markReady() {
}

func (m *mtxWithReadiness) awaitReady(ctx context.Context) error {
ctx, cancel := context.WithTimeoutCause(ctx, 30*time.Second, errors.New("exceeded 30 seconds in awaitReady"))
Copy link
Contributor

Choose a reason for hiding this comment

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

The 30s timeout seems somewhat arbitrary, but it proved to be a reasonable value.

@chaudum chaudum merged commit 28642b6 into main Jun 21, 2024
60 checks passed
@chaudum chaudum deleted the download-then-extract branch June 21, 2024 06:45
grafanabot pushed a commit that referenced this pull request Jun 21, 2024
This provides additional timing information about what step takes how long.
Additionally, the `awaitReady()` function is gated with a timeout context to avoid overly long waiting times.

Co-authored-by: Christian Haudum <christian.haudum@gmail.com>
(cherry picked from commit 28642b6)
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.

None yet

2 participants