Skip to content

Fix poller to maintain previous blocklist results on tenant error#3860

Merged
zalegrala merged 2 commits intografana:mainfrom
zalegrala:fixBlocklistResultsOnErrorCondition
Jul 12, 2024
Merged

Fix poller to maintain previous blocklist results on tenant error#3860
zalegrala merged 2 commits intografana:mainfrom
zalegrala:fixBlocklistResultsOnErrorCondition

Conversation

@zalegrala
Copy link
Copy Markdown
Contributor

@zalegrala zalegrala commented Jul 11, 2024

What this PR does:

Here we fix a bug where a single tenant experiences an error during polling,
which is not enough to trip the max error threshold. In this case, the tenant
which experienced the error would be removed from the blocklist, and would not
be re-added until the next time the poller runs. Inconsistent results in the
blocklist can cause issues on the query path for this tenant.

Which issue(s) this PR fixes:
Fixes #

Checklist

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

Copy link
Copy Markdown
Contributor

@mdisibio mdisibio left a comment

Choose a reason for hiding this comment

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

Yep this fixes my issue locally 👍

@zalegrala zalegrala force-pushed the fixBlocklistResultsOnErrorCondition branch from aa42bff to a2c2390 Compare July 12, 2024 13:14
@zalegrala zalegrala marked this pull request as ready for review July 12, 2024 13:40
@zalegrala zalegrala merged commit b446190 into grafana:main Jul 12, 2024
@zalegrala zalegrala deleted the fixBlocklistResultsOnErrorCondition branch July 12, 2024 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants