Ensure block height manager is restarted when BFT coordinator is#8308
Merged
matthew1001 merged 13 commits intohyperledger:mainfrom Mar 12, 2025
Merged
Ensure block height manager is restarted when BFT coordinator is#8308matthew1001 merged 13 commits intohyperledger:mainfrom
matthew1001 merged 13 commits intohyperledger:mainfrom
Conversation
Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>
…ithout calling reset Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>
Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>
Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>
Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>
Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>
jframe
reviewed
Feb 21, 2025
| LOG.debug("Interrupted while waiting for BftProcessor to stop.", e); | ||
| Thread.currentThread().interrupt(); | ||
| } | ||
| eventHandler.reset(); |
Contributor
There was a problem hiding this comment.
Reset seems odd here in that we trying to stop all processing of BFT here. A stop method to prevent any more processing in the controller would make sense. With everything stopped, we won't be processing BFT events anyway so maybe it's not worth it?
And by a stop method on the controller I'm thinking it would change the started state to false as it does right now in the reset method and also replace the block height manager with the noop version so it wouldn't do any processing of events.
Contributor
Author
There was a problem hiding this comment.
Yeah I originally called it stop(), but as it wasn't doing anything other than reset the state var I wasn't sure it was quite right. But I'm fine with using that term, and I'll add in replacing the block height manager at the same time as you've suggested.
Signed-off-by: Matthew Whitehead <matthew.whitehead@kaleido.io>
…pped Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>
Signed-off-by: Matt Whitehead <matthew.whitehead@kaleido.io>
matthew1001
force-pushed
the
bft-round-timer
branch
from
df1e619 to
881d371
Compare
matthew1001
force-pushed
the
bft-round-timer
branch
from
881d371 to
03b17a6
Compare
Contributor
Author
|
@jframe I think it's ready for another look now, thanks |
Signed-off-by: Matt Whitehead <matthew.whitehead@kaleido.io>
marcosio
pushed a commit
to IoBuilders/besu
that referenced
this pull request
Mar 12, 2025
…erledger#8308) * Ensure block height manager is restarted when BFT coordinator is Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Refactor and add runtime exception if an attempt is made to restart without calling reset Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Update BFT adaptor Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Uupdate changelog Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Add QBFT implementation and tests Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Update IBFT tests Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Rename reset() -> stop() Signed-off-by: Matthew Whitehead <matthew.whitehead@kaleido.io> * Replace the height manager with a no-op height manager while it's stopped Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Javadoc Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> --------- Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> Signed-off-by: Matthew Whitehead <matthew.whitehead@kaleido.io> Signed-off-by: Matt Whitehead <matthew.whitehead@kaleido.io> Signed-off-by: Marcos Serradilla Diez <marcos@io.builders>
matthew1001
added a commit
to kaleido-io/besu
that referenced
this pull request
Mar 25, 2025
…erledger#8308) * Ensure block height manager is restarted when BFT coordinator is Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Refactor and add runtime exception if an attempt is made to restart without calling reset Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Update BFT adaptor Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Uupdate changelog Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Add QBFT implementation and tests Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Update IBFT tests Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Rename reset() -> stop() Signed-off-by: Matthew Whitehead <matthew.whitehead@kaleido.io> * Replace the height manager with a no-op height manager while it's stopped Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Javadoc Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> --------- Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> Signed-off-by: Matthew Whitehead <matthew.whitehead@kaleido.io> Signed-off-by: Matt Whitehead <matthew.whitehead@kaleido.io>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
PR description
Some changes were made to the BFT mining coordinator to ensure it could be stopped and started (see #5861). A bug in those changes meant that when it was restarted, a new block height manager wasn't created.
This PR ensures that when BFT mining is restarted, so is the block height manager.
Fixed Issue(s)
Fixes #8307