Only stop block propagation, not tx handling. #4186
Merged
Conversation
This file contains 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
… handlers, leave all others (especially txs) alone Signed-off-by: Justin Florentine <[email protected]>
Signed-off-by: Justin Florentine <[email protected]>
Signed-off-by: Justin Florentine <[email protected]>
…890-retain-tx-handlers
macfarla
approved these changes
Jul 28, 2022
| @@ -815,6 +815,8 @@ public void shouldStopWhenTTDReached() { | |||
| blockPropagationManager.start(); | |||
| syncState.setReachedTerminalDifficulty(true); | |||
| assertThat(blockPropagationManager.isRunning()).isFalse(); | |||
| assertThat(ethProtocolManager.ethContext().getEthMessages().messageCodesHandled()) | |||
| .doesNotContain(1, 7); | |||
| } | |||
There was a problem hiding this comment.
maybe worth a comment to say what 1 and 7 are here, or use constants EthPV62.NEW_BLOCK
garyschulte
reviewed
Jul 29, 2022
Comment on lines
+147
to
+149
| newBlockSId.ifPresent(id -> ethContext.getEthMessages().unsubscribe(id, EthPV62.NEW_BLOCK)); | ||
| newBlockHashesSId.ifPresent( | ||
| id -> ethContext.getEthMessages().unsubscribe(id, EthPV62.NEW_BLOCK_HASHES)); |
There was a problem hiding this comment.
This implies that the subscriber id for BlockPropagationManager was the same as the id for transaction pool right?
I wonder how many other places we could have this problem (where we expect the subscriber id to be unique across Subcribers instances).
Signed-off-by: Justin Florentine <[email protected]>
Signed-off-by: Justin Florentine <[email protected]>
…890-retain-tx-handlers
eum602
pushed a commit
to lacchain/besu
that referenced
this pull request
Nov 3, 2023
* on block propagation stop, only kill the new block and new block hash handlers, leave all others (especially txs) alone Signed-off-by: Justin Florentine <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Since there is a Subscribers for each type of message handler in EthMessages, and only on handler, they all get a subscriber id of 1. This changes the unsubscribe logic to require the caller to specify the message code handler being unsubscribed from, and removes it from the map of handlers.
Fixed Issue(s)
fixes #3890
Documentation
doc-change-requiredlabel to this PR ifupdates are required.
Changelog