avoid generating log error on EnsureValidatedBlock / EnsureBlock#3424
Merged
tsachiherman merged 10 commits intoalgorand:masterfrom Jan 20, 2022
Merged
Conversation
tsachiherman
suggested changes
Jan 18, 2022
Contributor
tsachiherman
left a comment
tsachiherman
left a comment
There was a problem hiding this comment.
Thinking about this over the weekend, I think it would be better to "convert" the ledgercore.ErrNonSequentialBlockEval to ledgercore.BlockInLedgerError in ledger.AddBlock when err != nil and EvaluatorRound <= errNSBE.LatestRound.
The handling for both cases is the same and it would simplify the client code.
tsachiherman
suggested changes
Jan 18, 2022
Contributor
tsachiherman
left a comment
tsachiherman
left a comment
There was a problem hiding this comment.
in addition to the above, please also make sure to use distinguishable log messages, so that we could trace these back if/when needed.
… to reported messages.
Codecov Report
@@ Coverage Diff @@
## master #3424 +/- ##
==========================================
+ Coverage 47.65% 47.67% +0.02%
==========================================
Files 370 370
Lines 59804 59808 +4
==========================================
+ Hits 28498 28516 +18
+ Misses 28001 27986 -15
- Partials 3305 3306 +1
Continue to review full report at Codecov.
|
…ock is already in the ledger
algorandskiy
approved these changes
Jan 19, 2022
This was referenced Jan 20, 2022
jannotti
pushed a commit
that referenced
this pull request
Jan 24, 2022
* ledger: fix `NextRewardsState()` (#3403) ## Summary A modification of #3336. Added a new test where the rewards pool overspends and proposed a fix in `NextRewardsState()` requiring a consensus upgrade. ## Test Plan This is mostly tests. * Fix a potential problem of committing non-uniform consensus versions (#3453) If accountdb accumulates a large backlog, it is possible catchpoint tracker would attempt to commit a wider range than account updates tracker expects. * avoid generating log error on EnsureValidatedBlock / EnsureBlock (#3424) In EnsureBlock,, do not log as error message if the error is ledgercore.ErrNonSequentialBlockEval and the block round is in the past (i.e. already in the ledger). * Fix typo Fulll to Full (#3456) Fix typo * Fix worng message on restore crash db. (#3455) When crash state is found but could not be restored, noCrashState variable is used to report a warning. However, this variable was set to false in a case where there was no crash state, and the wrong warning was reported. * Adding new scenario for feature networks (#3451) Co-authored-by: Tolik Zinovyev <tolik@algorand.com> Co-authored-by: Pavel Zbitskiy <65323360+algorandskiy@users.noreply.github.com> Co-authored-by: Shant Karakashian <55754073+algonautshant@users.noreply.github.com>
jannotti
pushed a commit
that referenced
this pull request
Jan 25, 2022
* ledger: fix `NextRewardsState()` (#3403) ## Summary A modification of #3336. Added a new test where the rewards pool overspends and proposed a fix in `NextRewardsState()` requiring a consensus upgrade. ## Test Plan This is mostly tests. * Fix a potential problem of committing non-uniform consensus versions (#3453) If accountdb accumulates a large backlog, it is possible catchpoint tracker would attempt to commit a wider range than account updates tracker expects. * avoid generating log error on EnsureValidatedBlock / EnsureBlock (#3424) In EnsureBlock,, do not log as error message if the error is ledgercore.ErrNonSequentialBlockEval and the block round is in the past (i.e. already in the ledger). * Fix typo Fulll to Full (#3456) Fix typo * Fix worng message on restore crash db. (#3455) When crash state is found but could not be restored, noCrashState variable is used to report a warning. However, this variable was set to false in a case where there was no crash state, and the wrong warning was reported. * Adding new scenario for feature networks (#3451) * Fixing telemetry ports (#3497) Co-authored-by: Tolik Zinovyev <tolik@algorand.com> Co-authored-by: Pavel Zbitskiy <65323360+algorandskiy@users.noreply.github.com> Co-authored-by: Shant Karakashian <55754073+algonautshant@users.noreply.github.com> Co-authored-by: Jack <87339414+algojack@users.noreply.github.com>
Merged
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
In EnsureBlock,, do not log as error message if the error is
ledgercore.ErrNonSequentialBlockEvaland the block round is in the past (i.e. already in the ledger).Added a test to verify the behavior.
Resolves https://github.com/algorand/go-algorand-internal/issues/1831