reset cache after heal (hyperledger#5266)

* reset cache after heal Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
elenduuche · Aug 16, 2023 · 9220bb8 · 9220bb8
1 parent b07083e
commit 9220bb8
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 7 deletions.
diff --git a/...eum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateProvider.java b/...eum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateProvider.java
@@ -336,8 +336,11 @@ public TrieLogManager getTrieLogManager() {
   }
 
   @Override
-  public void setArchiveStateUnSafe(final BlockHeader blockHeader) {
-    persistedState.setArchiveStateUnSafe(blockHeader);
+  public void resetArchiveStateTo(final BlockHeader blockHeader) {
+    persistedState.resetWorldStateTo(blockHeader);
+    this.trieLogManager.reset();
+    this.trieLogManager.addCachedLayer(
+        blockHeader, persistedState.worldStateRootHash, persistedState);
   }
 
   @Override

diff --git a/...e/src/main/java/org/hyperledger/besu/ethereum/bonsai/cache/CachedWorldStorageManager.java b/...e/src/main/java/org/hyperledger/besu/ethereum/bonsai/cache/CachedWorldStorageManager.java
@@ -161,6 +161,11 @@ public Optional<BonsaiWorldState> getHeadWorldState(
             });
   }
 
+  @Override
+  public void reset() {
+    this.cachedWorldStatesByHash.clear();
+  }
+
   @Override
   public void onClearStorage() {
     this.cachedWorldStatesByHash.clear();

diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogManager.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogManager.java
@@ -45,5 +45,7 @@ Optional<BonsaiWorldState> getHeadWorldState(
 
   long getMaxLayersToLoad();
 
+  void reset();
+
   Optional<TrieLogLayer> getTrieLogLayer(final Hash blockHash);
 }
diff --git a/...m/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/worldview/BonsaiWorldState.java b/...m/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/worldview/BonsaiWorldState.java
@@ -126,7 +126,12 @@ public Optional<Bytes> getCode(@Nonnull final Address address, final Hash codeHa
     return worldStateStorage.getCode(codeHash, Hash.hash(address));
   }
 
-  public void setArchiveStateUnSafe(final BlockHeader blockHeader) {
+  /**
+   * Reset the worldState to this block header
+   *
+   * @param blockHeader block to use
+   */
+  public void resetWorldStateTo(final BlockHeader blockHeader) {
     worldStateBlockHash = Hash.fromPlugin(blockHeader.getBlockHash());
     worldStateRootHash = Hash.fromPlugin(blockHeader.getStateRoot());
   }

diff --git a/...core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DefaultWorldStateArchive.java b/...core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DefaultWorldStateArchive.java
@@ -74,7 +74,7 @@ public MutableWorldState getMutable() {
   }
 
   @Override
-  public void setArchiveStateUnSafe(final BlockHeader blockHeader) {
+  public void resetArchiveStateTo(final BlockHeader blockHeader) {
     // ignore for forest
   }
 

diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStateArchive.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStateArchive.java
@@ -42,7 +42,12 @@ public interface WorldStateArchive extends Closeable {
 
   MutableWorldState getMutable();
 
-  void setArchiveStateUnSafe(BlockHeader blockHeader);
+  /**
+   * Resetting the archive cache and adding the new pivot as the only entry
+   *
+   * @param blockHeader new pivot block header
+   */
+  void resetArchiveStateTo(BlockHeader blockHeader);
 
   Optional<Bytes> getNodeData(Hash hash);
 

diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DefaultSynchronizer.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DefaultSynchronizer.java
@@ -254,8 +254,7 @@ private CompletableFuture<Void> handleSyncResult(final FastSyncState result) {
     result
         .getPivotBlockHeader()
         .ifPresent(
-            blockHeader ->
-                protocolContext.getWorldStateArchive().setArchiveStateUnSafe(blockHeader));
+            blockHeader -> protocolContext.getWorldStateArchive().resetArchiveStateTo(blockHeader));
     LOG.info(
         "Sync completed successfully with pivot block {}",
         result.getPivotBlockNumber().getAsLong());