This repository has been archived by the owner on Jan 13, 2025. It is now read-only.
Fixes the calculation of the compute_meter_consumption #21944
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
…ss_instruction() and process_message().
Lichtso
force-pushed
the
fix/compute_meter_consumption_measurement
branch
from
e551410 to
d29453a
Compare
Codecov Report
@@ Coverage Diff @@
## master #21944 +/- ##
=======================================
Coverage 81.2% 81.2%
=======================================
Files 516 516
Lines 144353 144353
=======================================
+ Hits 117315 117350 +35
+ Misses 27038 27003 -35 |
mergify bot
added a commit
that referenced
this pull request
Dec 16, 2021
…ss_instruction() and process_message(). (#21944) (#21945) (cherry picked from commit 49cb161) Co-authored-by: Alexander Meißner <[email protected]>
|
@taozhu-chicago This should also go into v1.8 correct? |
|
I don't know it it was already broken prior to #21671, but that was only backported to 1.9 so I did the same for this PR. |
The aggregated CUs from 1.8.10 looks reasonable. If impact of the bug fixed by this change is infrequently, I think it is OK to leave it out of 1.8. I am only considering the effort of release. |
Closed
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Problem
The calculation of the
compute_meter_consumptionacrossprocess_instruction()andprocess_message()was broken in #21671. Theprevalue was measured beforeInvokeContext::push(), then the compute meter was reset to a higher value and later thepostvalue could be above theprevalue, resulting in a negative consumption (overflow).This was not caught by the tests as the bug only happens before the feature
tx_wide_compute_capis activated and it is always activated in the tests.Summary of Changes
Moves from
process_message()toprocess_instruction()so that it does not include modification of thecompute_meterinInvokeContext::push().Fixes #