Skip to content
This repository has been archived by the owner on Aug 23, 2023. It is now read-only.

Fix: querying rollup data does not show aggregated points corresponding to points in ROB #2022

Merged
merged 4 commits into from
Feb 4, 2022

Conversation

zlin179
Copy link
Contributor

@zlin179 zlin179 commented Jan 4, 2022

Fix for issue #1485

Describe your changes
The rollup aggregators only get the points once they leave the ROB.
This PR fixs aggregator so when being queried it will return the current value (considering points in ROB) but will not actually consume the points in ROB.

Testing performed

  • Add some unit tests for it and pass it.
  • Integrate test by comparing raw data and rollup data queried at the same time

mt-fix

@Dieterbe
Copy link
Contributor

Dieterbe commented Feb 2, 2022

I have started reviewing this. It looks promising, but I suggest in the future to create a cleaner commit history (e.g. by using git rebase -i. E.g. the first commit which claims to just introduce a test, also changes core functionality and does very strange changes to mdata/aggmetrics.go such as removing unrelated code.

I will go ahead and review it in its current shape and will probably squash merge this instead of a regular merge.

mdata/aggregator.go Outdated Show resolved Hide resolved
@zlin179 zlin179 requested a review from Dieterbe February 4, 2022 15:15
@Dieterbe Dieterbe merged commit 76cb86b into grafana:master Feb 4, 2022
Dieterbe added a commit that referenced this pull request Feb 8, 2022
small cleanups for using ROB for rollup reads introduced in #2022
@shanson7 shanson7 deleted the fix_agg_rob branch February 28, 2024 14:13
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants