ledger: fix LookupLatest when the ledger advances #3769
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
algorandskiy
commented
Mar 14, 2022
| var wg sync.WaitGroup | ||
| wg.Add(1) | ||
| done := make(chan struct{}) | ||
| go func() { |
There was a problem hiding this comment.
I had another implementation with timer a bit simpler but this looks a bit more robust. Any suggestions on how to check lookupLatest has been blocked at au.accountsReadCond.Wait() ?
There was a problem hiding this comment.
I think you'd have to change accountsReadCond to use an interface and create a mock (or wrapped) sync.Cond?
There was a problem hiding this comment.
I thought about adding some code into lookupLatest or abstracting the cond var, but thought it is too much only for a single tests.
algorandskiy
force-pushed
the
pavel/ledger-unlimited-asset-lookuplatest-2
branch
from
d4848e1
to
c720cb4
Compare
tsachiherman
approved these changes
Mar 15, 2022
| @@ -886,7 +886,7 @@ func (au *accountUpdates) lookupLatest(addr basics.Address) (data basics.Account | |||
| var resourceDbRound basics.Round | |||
| withRewards := true | |||
|
|
|||
| foundAccount := false | |||
| var foundAccount bool | |||
There was a problem hiding this comment.
The two are equivilent..
tsachiherman
approved these changes
Mar 15, 2022
cce
reviewed
Mar 15, 2022
| @@ -957,6 +960,7 @@ func (au *accountUpdates) lookupLatest(addr basics.Address) (data basics.Account | |||
| return basics.AccountData{}, basics.Round(0), basics.MicroAlgos{}, fmt.Errorf("offset != len(au.deltas): %w", ErrLookupLatestResources) | |||
| } | |||
| ad = ledgercore.AccountData{} | |||
| foundAccount = false | |||
Merged
This was referenced Mar 15, 2022
tsachiherman
pushed a commit
that referenced
this pull request
Mar 19, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
LookupLatest combines base account and resources data, and in some cases it cannot
determine reliably how many resources account has, therefore it reads data directly from the DB.
The DB might advance causing cachedDBRound (and base account data) and resourceDbRound
to be out of sync, and a retry needed.
If on retry baseAccount data is outdated, foundAccount flag incorrectly contains a value from
a previous iteration causing completion by checkDone because of empty ad (ledgercore.AccountData).
Having ad and foundAccount synchronized on retry eliminates the problem.
In addition checkDone improved for scenarios when accounts have only own assets.
Test Plan
Added new test