[r284] Backport: Handle TSDB native histogram validation errors as soft errors (#7773) #7785
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
* Revert "Distributor: add bucket count validation to native histograms (#7736)" This reverts commit fb7dbaa. * Handle TSDB native histogram validation errors are soft errors * add all testcases Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Count towards discarded samples metrics with new reason Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> --------- Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> (cherry picked from commit 51c4088)
pstibrany
approved these changes
Apr 3, 2024
grafanabot
pushed a commit
that referenced
this pull request
Apr 3, 2024
…#7785) * Revert "Distributor: add bucket count validation to native histograms (#7736)" This reverts commit fb7dbaa. * Handle TSDB native histogram validation errors are soft errors * add all testcases Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Count towards discarded samples metrics with new reason Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> --------- Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> (cherry picked from commit 51c4088) (cherry picked from commit 868d1b3)
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-7785-to-r282 origin/r282
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 868d1b34cfd1411ff8f8e113cb639013deed1198
# Push it to GitHub
git push --set-upstream origin backport-7785-to-r282
git switch main
# Remove the local backport branch
git branch -D backport-7785-to-r282Then, create a pull request where the |
krajorama
added a commit
that referenced
this pull request
Apr 3, 2024
…#7785) (#7786) * Revert "Distributor: add bucket count validation to native histograms (#7736)" This reverts commit fb7dbaa. * Handle TSDB native histogram validation errors are soft errors * add all testcases Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Count towards discarded samples metrics with new reason Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> --------- Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> (cherry picked from commit 51c4088) (cherry picked from commit 868d1b3) Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.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.
This reverts commit fb7dbaa.
Handle TSDB native histogram validation errors are soft errors
add all testcases
Signed-off-by: György Krajcsovits gyorgy.krajcsovits@grafana.com
Signed-off-by: György Krajcsovits gyorgy.krajcsovits@grafana.com
Signed-off-by: György Krajcsovits gyorgy.krajcsovits@grafana.com
(cherry picked from commit 51c4088)