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.

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

Fix race condition in tx pool (upstream cherry pick) #1800

Merged
merged 3 commits into from
Jan 25, 2022

Conversation

hbandura
Copy link
Contributor

@hbandura hbandura commented Jan 20, 2022

Cherry pick from upstream 067084f

ethereum/go-ethereum@067084f

Potentially fixing this issue seen in a different L1:
ethereum/go-ethereum#23690

MariusVanDerWijden and others added 2 commits January 20, 2022 18:34
core: fix race conditions in txpool (#23474)

* core: fix race conditions in txpool

* core: fixed races in the txpool

* core: rebased on master

* core: move reheap mutex

* core: renamed mutex

* core: revert Reheap changes
@hbandura hbandura requested a review from a team as a code owner January 20, 2022 21:54
@hbandura hbandura requested review from mcortesi and 37ng and removed request for a team January 20, 2022 21:54
@piersy
Copy link
Contributor

piersy commented Jan 20, 2022

Coverage from tests in ./e2e_test/... for ./consensus/istanbul/... at commit 61c7ba6

coverage: 51.7% of statements across all listed packages
coverage:  66.1% of statements in consensus/istanbul
coverage:  42.5% of statements in consensus/istanbul/announce
coverage:  55.7% of statements in consensus/istanbul/backend
coverage:   0.0% of statements in consensus/istanbul/backend/backendtest
coverage:  24.3% of statements in consensus/istanbul/backend/internal/replica
coverage:  70.9% of statements in consensus/istanbul/core
coverage:  50.0% of statements in consensus/istanbul/db
coverage:   0.0% of statements in consensus/istanbul/proxy
coverage:  75.3% of statements in consensus/istanbul/uptime
coverage: 100.0% of statements in consensus/istanbul/uptime/store
coverage:  51.8% of statements in consensus/istanbul/validator
coverage:  79.2% of statements in consensus/istanbul/validator/random
CommentID: 97c1b43da8

Copy link
Contributor

@gastonponti gastonponti left a comment

Choose a reason for hiding this comment

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

LGTM

@gastonponti gastonponti merged commit 3610f8b into master Jan 25, 2022
@gastonponti gastonponti deleted the hbandura/race_fix branch January 25, 2022 16:33
gastonponti added a commit that referenced this pull request Jan 25, 2022
* Cherry pick from upstream 067084f

core: fix race conditions in txpool (#23474)

* core: fix race conditions in txpool

* core: fixed races in the txpool

* core: rebased on master

* core: move reheap mutex

* core: renamed mutex

* core: revert Reheap changes

* Fix drop tx test

Co-authored-by: Marius van der Wijden <[email protected]>
Co-authored-by: Gaston Ponti <[email protected]>
gastonponti added a commit that referenced this pull request Jan 26, 2022
* Cherry pick from upstream 067084f

core: fix race conditions in txpool (#23474)

* core: fix race conditions in txpool

* core: fixed races in the txpool

* core: rebased on master

* core: move reheap mutex

* core: renamed mutex

* core: revert Reheap changes

* Fix drop tx test

Co-authored-by: Marius van der Wijden <[email protected]>
Co-authored-by: Gaston Ponti <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants