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

Bws internal error fix #6806

Merged
merged 7 commits into from
Apr 4, 2024
Merged

Bws internal error fix #6806

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f0275d2
Only add new hash for BWS if ready for BWS
jframe Mar 21, 2024
eaece10
Only make isReady changes to syncBackwardsUntil with blockHash
jframe Mar 21, 2024
bf07f43
update gradle.properties for build from source
jframe Mar 21, 2024
1cb33cc
Revert "update gradle.properties for build from source"
jframe Mar 26, 2024
bcd79f9
add unit test
jframe Mar 26, 2024
562f7cd
Move "Appending new head block hash" to BackwardSyncContext so that i…
jframe Mar 26, 2024
2416d3a
Merge branch 'main' into bws_internal_error_fix
jframe Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions ...ge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,10 +501,6 @@ public Optional<BlockHeader> getOrSyncHeadByHash(final Hash headHash, final Hash
.addArgument(maybeHeadHeader.get()::toLogString)
.log();
} else {
LOG.atDebug()
.setMessage("Appending new head block hash {} to backward sync")
.addArgument(headHash::toHexString)
.log();
backwardSyncContext.maybeUpdateTargetHeight(headHash);
backwardSyncContext
.syncBackwardsUntil(headHash)
Expand Down
12 changes: 8 additions & 4 deletions ...rc/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,15 @@ public synchronized void maybeUpdateTargetHeight(final Hash headHash) {
}

public synchronized CompletableFuture<Void> syncBackwardsUntil(final Hash newBlockHash) {
if (!isTrusted(newBlockHash)) {
backwardChain.addNewHash(newBlockHash);
}

if (isReady()) {
if (!isTrusted(newBlockHash)) {
LOG.atDebug()
.setMessage("Appending new head block hash {} to backward sync")
.addArgument(newBlockHash::toHexString)
.log();
backwardChain.addNewHash(newBlockHash);
}

final Status status = getOrStartSyncSession();
backwardChain
.getBlock(newBlockHash)
Expand Down
14 changes: 14 additions & 0 deletions ...est/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,20 @@ public void shouldSyncUntilHash() throws Exception {
assertThat(localBlockchain.getChainHeadBlock()).isEqualTo(remoteBlockchain.getChainHeadBlock());
}

@Test
public void shouldNotSyncUntilHashWhenNotInSync() {
doReturn(false).when(context).isReady();
final Hash hash = getBlockByNumber(REMOTE_HEIGHT).getHash();
final CompletableFuture<Void> future = context.syncBackwardsUntil(hash);

respondUntilFutureIsDone(future);

assertThatThrownBy(future::get)
.isInstanceOf(ExecutionException.class)
.hasMessageContaining("Backward sync is not ready");
assertThat(backwardChain.getFirstHashToAppend()).isEmpty();
}

@Test
public void shouldSyncUntilRemoteBranch() throws Exception {

Expand Down