Fix remaining data race in BurningManAccountingStore #7047
Merged
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.
Add missing synchronisation to the
BurningManAccountingStore.toProtoMessage
method, by first copying the internal list of accounting blocks inside a read-lock, prior to serialisation (still outside the lock, to maximise concurrency). Since we only make a shallow copy, this should be fast and take no more than a MB or so of extra memory.This prevents a data race seen to cause a
ConcurrentModificationException
during store persistence, that sometimes occurred when the application resumed from a long suspension, as seen in the following log snippet (from a few months back, but probably still relevant):Most of the accounting store data races were fixed a year ago in #6551, which ensured all access to the internal linked list of accounting blocks is synchronised, except that via
toProtoMessage
.