Skip to content

[release-v2.2] Fix panic in the metrics-generator when using multiple tenants with default overrides#2800

Closed
yvrhdn wants to merge 1 commit intografana:release-v2.2from
yvrhdn:backport-2786-to-release-v2.2
Closed

[release-v2.2] Fix panic in the metrics-generator when using multiple tenants with default overrides#2800
yvrhdn wants to merge 1 commit intografana:release-v2.2from
yvrhdn:backport-2786-to-release-v2.2

Conversation

@yvrhdn
Copy link
Copy Markdown
Contributor

@yvrhdn yvrhdn commented Aug 17, 2023

Backport 9af6bb2 from #2786


What this PR does:
We have a concurrent read/write panic while reading from desiredProcessors, this is the only place we modify it really. Let's copy it before modifying it.

Which issue(s) this PR fixes:
Fixes #2785

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

…efault overrides (grafana#2785)

* Modify concurrency test to consider multitenant / concurrent updateProcessors calls

* Copy desiredProcessors map before modifying it

* Update CHANGELOG.md

(cherry picked from commit 9af6bb2)
Comment thread CHANGELOG.md
Comment on lines +2 to +13
* [FEATURE] Add the `/api/status/buildinfo` endpoint [#2702](https://github.com/grafana/tempo/pull/2702) (@fabrizio-grafana)
* [FEATURE] New encoding vParquet3 with support for dedicated attribute columns (@mapno, @stoewer) [#2649](https://github.com/grafana/tempo/pull/2649)
* [FEATURE] Add filtering support to Generic Forwarding [#2742](https://github.com/grafana/tempo/pull/2742) (@Blinkuu)
* [ENHANCEMENT] Assert ingestion rate limits as early as possible [#2640](https://github.com/grafana/tempo/pull/2703) (@mghildiy)
* [ENHANCEMENT] Add several metrics-generator fields to user-configurable overrides [#2711](https://github.com/grafana/tempo/pull/2711) (@kvrhdn)
* [ENHANCEMENT] Update /api/metrics/summary to correctly handle missing attributes and improve performance of TraceQL `select()` queries. [#2765](https://github.com/grafana/tempo/pull/2765) (@mdisibio)
* [ENHANCEMENT] Add `TempoUserConfigurableOverridesReloadFailing` alert [#2784](https://github.com/grafana/tempo/pull/2784) (@kvrhdn)
* [BUGFIX] Fix panic in metrics summary api [#2738](https://github.com/grafana/tempo/pull/2738) (@mdisibio)
* [BUGFIX] Fix node role auth IDMSv1 [#2760](https://github.com/grafana/tempo/pull/2760) (@coufalja)
* [BUGFIX] Only search ingester blocks that fall within the request time range. [#2783](https://github.com/grafana/tempo/pull/2783) (@joe-elliott)
* [BUGFIX] Fix incorrect metrics for index failures [#2781](https://github.com/grafana/tempo/pull/2781) (@zalegrala)
* [BUGFIX] Fix panic in the metrics-generator when using multiple tenants with default overrides [#2786](https://github.com/grafana/tempo/pull/2786) (@kvrhdn)
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.

I'm not really sure what to do with these? Should I not include them or only the relevant changelog entry?

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.

don't worry about it. i will clean these up.

@joe-elliott
Copy link
Copy Markdown
Collaborator

Closed in favor of: #2806

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport type/bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants