Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

reset cache after heal #5266

Merged
merged 4 commits into from
Mar 30, 2023
Merged

reset cache after heal #5266

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
859f5cc
reset cache after heal
matkt Mar 24, 2023
27ddcb4
reset cache after heal
matkt Mar 24, 2023
942c2b4
Merge branch 'main' into feature/fix-reset-cache-after-heal
matkt Mar 26, 2023
e2b860b
Merge branch 'main' into feature/fix-reset-cache-after-heal
matkt Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...eum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,9 @@ public TrieLogManager getTrieLogManager() {
@Override
public void setArchiveStateUnSafe(final BlockHeader blockHeader) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this method name should change to reflect its use. IMO it isn't setting the archive unsafe for use like the name implies, but rather is resetting the archive cache and adding the new pivot as the only entry. Perhaps resetArchiveStateTo(BlockHeader)

Similarly, BonsaiWorldState.setArchiveUnsafe should be something more along the lines of resetWorldStateTo(BlockHeader)

These methods could use javadoc describing the intent

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated the code

persistedState.setArchiveStateUnSafe(blockHeader);
this.trieLogManager.reset();
this.trieLogManager.addCachedLayer(
blockHeader, persistedState.worldStateRootHash, persistedState);
}

@Override
Expand Down
5 changes: 5 additions & 0 deletions ...e/src/main/java/org/hyperledger/besu/ethereum/bonsai/cache/CachedWorldStorageManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,11 @@ public Optional<BonsaiWorldState> getHeadWorldState(
});
}

@Override
public void reset() {
this.cachedWorldStatesByHash.clear();
}

@Override
public void onClearStorage() {
this.cachedWorldStatesByHash.clear();
Expand Down
2 changes: 2 additions & 0 deletions ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,7 @@ Optional<BonsaiWorldState> getHeadWorldState(

long getMaxLayersToLoad();

void reset();

Optional<TrieLogLayer> getTrieLogLayer(final Hash blockHash);
}