Skip to content

Conversation

@Segflow
Copy link
Contributor

@Segflow Segflow commented Dec 5, 2025

What this PR does / why we need it:

This PR is part of proposal 4 described in this design document.

PR grafana/dskit#799 adds the ability to lock state change, this PR updates the prepare downscale handler to return 409 if the state change is locked.

We also have a PR in rollout-operator that properly handles this status code: grafana/rollout-operator#343

Notes to reviewer:

dskit #759 made it not possible to use a zero heartbeat-period or zero heartbeat-timeout in the ring configuration.

I had to update some pkg/ruler and pkg/limits tests to ensure both these fields are set otherwise the test fails.

We also removed 0 = disabled from our configuration documents. We do not use it and we believe that should be an incorrect configuration.

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
  • 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

@Segflow Segflow requested a review from a team as a code owner December 5, 2025 19:28
@Segflow Segflow marked this pull request as draft December 5, 2025 19:28
@Segflow Segflow marked this pull request as ready for review December 10, 2025 14:20
@Segflow Segflow force-pushed the meher/add-state-change-locked branch from 794c9cf to 452b9fd Compare December 10, 2025 14:24
@Segflow Segflow changed the title Feat: Handle state change lock in prepare downscale feat: Handle state change lock in prepare downscale Dec 10, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Dec 10, 2025

💻 Deploy preview deleted (feat: Handle state change lock in prepare downscale ).

@Segflow Segflow force-pushed the meher/add-state-change-locked branch from dfb82b2 to 42464d2 Compare December 10, 2025 16:14
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This file is generated using make doc

@Segflow Segflow merged commit de092da into main Dec 12, 2025
70 checks passed
@Segflow Segflow deleted the meher/add-state-change-locked branch December 12, 2025 13:42
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.

2 participants