Jsonnet: honor the minimum shard size configured #4363
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Marco Pracucci <marco@pracucci.com>
krajorama
added a commit
that referenced
this pull request
Mar 6, 2023
* Helm: nginx HPA and tests kubeversion fixes (#4299) * Helm: fix Kubernetes override for nginx HPA The template did not take into account the override "kubeVersionOverride". Fix by using the mimir template implemented for this reason. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Helm: fix missing Kubernetes version overrides in tests The golden record tests need a fixed version because helm uses the version of the default context and can produce different results between contributor's machine and the CI environment. Add logic to test build to inject the minimal version if not found in the values file. Mainly because we cannot have a version override in the small and large values files. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Co-authored-by: Jon Kartago Lamida <lamidaj@gmail.com> * Ruler: load more tenants in parallel during startup (#4258) * Ruler: load more tenants in parallel during startup * add more tests * fix lint * Apply suggestions from code review Co-authored-by: Marco Pracucci <marco@pracucci.com> * Ingester: fix OOO blocks labelling (#4297) * Ingester: fix OOO blocks labelling This fixes a bug where the OutOfOrderExternalLabel was being added to all blocks instead of the ones coming from OOO data, when the feature flag was enabled. * Changelog * PR number to changelog * Update previous changelog entry instead * Ruler: load more tenants in parallel during startup * fix context * improve unittest --------- Co-authored-by: Marco Pracucci <marco@pracucci.com> Co-authored-by: Nicolás Pazos <32206519+npazosmendez@users.noreply.github.com> * Change language to match the math. (#4356) * Upgrade mimir-prometheus to get a fast regexp path optimization (#4357) * Upgrade mimir-prometheus to get a fast regexp path optimization Signed-off-by: Marco Pracucci <marco@pracucci.com> * Added CHANGELOG entry Signed-off-by: Marco Pracucci <marco@pracucci.com> --------- Signed-off-by: Marco Pracucci <marco@pracucci.com> * Fix typo in the docs URL for migrating from Cortex (#4358) * Remove forced paragraph break. (#4359) * Bump actions/setup-go to v3 to resolve Node.js 12 deprecation warning. (#4361) * Improve flaky `TestIngesterWithShippingDisabledDeletesBlocksOnlyAfterRetentionExpires` (#4362) * Use more specific assertion to include more information in test failures. See #4198. * Reduce flakiness of test by extending retention period. This gives the rest of the test more time to retrieve `oldBlocks` before any of the blocks is removed. * Add asynchronous validation scaffolding for block upload (#3411) * Add asynchronous validation scaffolding for block upload * addressed lint errors * Update pkg/compactor/block_upload.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/compactor/block_upload.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/compactor/block_upload.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/compactor/block_upload.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/compactor/block_upload.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/compactor/block_upload.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * enable block upload for dev testing * fixed validation errors, added debug log messages * fixed cancelled context issue * changed name of flag to disable complete block upload * addressed reviewer feedback * addressed reviewer feedback * Address some review comments, WIP * Small spacing cleanup * Transition to in-memory bucket for block finish test * Async validation test coordination, adding configuration flags * Small comment and flag fix * Swap config strategy, test still needs separation * Docs + lint * Review comments, begin separating tests * Finish validateAndComplete test * Update docs * Remove docker compose arguments * Regenerate rather than modify * Review, add test for periodicValidationUpdater * Make validateAndComplete test clearer, add upload meta check * Set missing cancelContext * Add sleep as suggested * Configure data directory * fixed compactor data dir in e2e test * Add changelog entry * Split into two entries * Missing entry number * Update CHANGELOG.md --------- Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Andy Asp <andy.asp@grafana.com> Co-authored-by: Andy Asp <90626759+andyasp@users.noreply.github.com> * Jsonnet: honor the minimum shard size configured (#4363) Signed-off-by: Marco Pracucci <marco@pracucci.com> * [CHANGE] Ruler: set default `evaluation-delay-duration` to 1m (#4250) * change the default evaluation delay of ruler to 1m * revert the changes in ruler test * change integration test to set ruler default value * fix integration tests * Update integration/configs.go Co-authored-by: Marco Pracucci <marco@pracucci.com> * Update CHANGELOG.md Co-authored-by: Peter Štibraný <pstibrany@gmail.com> --------- Co-authored-by: Marco Pracucci <marco@pracucci.com> Co-authored-by: Peter Štibraný <pstibrany@gmail.com> * [Chore] Update jsonnet manifest create query frontend discovery only when it is necessary (#4353) * [Chore] update jsonnet manifest, avoid setting querier.frontend-address or create query-frontend-discovery when deployement mode is microserivces or query-scheduler is enabled * linter and changelog * Helm: fix parity with jsonnet on query frontend headless service Do not generate query-frontend-headless service if query scheduler is enabled Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Apply suggestions from code review Co-authored-by: Marco Pracucci <marco@pracucci.com> * correct changelog * regenerate helm golden files * Update CHANGELOG.md --------- Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Co-authored-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Co-authored-by: Marco Pracucci <marco@pracucci.com> * Remove block validation mimirtool changelog entry (#4369) * Spread TSDB head compaction over the configured interval (#4364) * Spread TSDB head compaction over the configured interval Signed-off-by: Marco Pracucci <marco@pracucci.com> * Fixed unit test Signed-off-by: Marco Pracucci <marco@pracucci.com> * Apply suggestion from code review Signed-off-by: Marco Pracucci <marco@pracucci.com> * Fix typo in CHANGELOG entry Signed-off-by: Marco Pracucci <marco@pracucci.com> * Fix typo in CHANGELOG entry Signed-off-by: Marco Pracucci <marco@pracucci.com> --------- Signed-off-by: Marco Pracucci <marco@pracucci.com> * Fix port number values. (#4368) * Ruler: change deployment max surge and max unavailable to reduce ownership spillover (#4381) * Ruler: change deployment max surge and max unavailable to reduce ownership spillover Signed-off-by: Marco Pracucci <marco@pracucci.com> * Apply suggestions from code review Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> --------- Signed-off-by: Marco Pracucci <marco@pracucci.com> Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Move "Note:" about cross-zone costs to "Costs" (#4370) This note was in an unrelated section. Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com> * Change default -blocks-storage.tsdb.retention-period from 24h to 13h (#4382) Signed-off-by: Marco Pracucci <marco@pracucci.com> * Support histograms in pkg/storage and update other breakages (#4354) * Support histograms in pkg/storage and update other breakages Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> --------- Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Signed-off-by: Marco Pracucci <marco@pracucci.com> Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com> Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> Co-authored-by: Jon Kartago Lamida <lamidaj@gmail.com> Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com> Co-authored-by: Marco Pracucci <marco@pracucci.com> Co-authored-by: Nicolás Pazos <32206519+npazosmendez@users.noreply.github.com> Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com> Co-authored-by: l3ioo <122443155+l3ioo@users.noreply.github.com> Co-authored-by: Charles Korn <charleskorn@users.noreply.github.com> Co-authored-by: Vernon Miller <96601789+aldernero@users.noreply.github.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Andy Asp <andy.asp@grafana.com> Co-authored-by: Andy Asp <90626759+andyasp@users.noreply.github.com> Co-authored-by: Peter Štibraný <pstibrany@gmail.com> Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> Co-authored-by: Oleg Zaytsev <mail@olegzaytsev.com> Co-authored-by: Ganesh Vernekar <ganeshvern@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does
The default shard size is configured in
$._config.shuffle_sharding. Due to how our user class limits work, the default is also considered being the minimum, because user class limits are meant to increase limits. For this reason, in case someone increase the default shard sizes, I propose to honor them as minimum values when applying the upper classes limits.Which issue(s) this PR fixes or relates to
N/A
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]