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

p2p/discv4: revert gotreply handler change from #8661 (#9119) #9195

Merged
merged 2 commits into from
Jan 11, 2024
Merged

Conversation

battlmonstr
Copy link
Contributor

@battlmonstr battlmonstr commented Jan 10, 2024

The handler had race conditions in the candidates processing goroutine.

Copy link
Contributor

@mh0lt mh0lt left a comment

Choose a reason for hiding this comment

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

I think we can refector this code I don't think we can 4refer it there are too many nodes on polygon which don't meet this match creieria:

if p.from == r.from && p.ptype == r.data.Kind() && p.ip.Equal(r.ip)

but do match this:

if p.ptype == r.data.Kind() && p.ip.Equal(r.ip) && p.port == r.port

I think if we need to simplify the structure we should use the second match.or we could use an or

I'm not sure why I had this split in 2 like this.

@mh0lt mh0lt merged commit 0449818 into devel Jan 11, 2024
7 checks passed
@mh0lt mh0lt deleted the pr/9119 branch January 11, 2024 15:04
battlmonstr added a commit that referenced this pull request Jan 11, 2024
The handler had race conditions in the candidates processing goroutine.
yperbasis added a commit that referenced this pull request Jan 11, 2024
…#9210)

Co-authored-by: yperbasis <andrey.ashikhmin@gmail.com>
racytech pushed a commit to racytech/erigon that referenced this pull request Jan 12, 2024
…ontech#9119) (erigontech#9195)

The handler had race conditions in the candidates processing goroutine.
wmitsuda added a commit that referenced this pull request Jan 19, 2024
commit 0c7300e
Author: Willian Mitsuda <wmitsuda@gmail.com>
Date:   Fri Jan 12 20:05:43 2024 -0300

    Squashed work from ots2-alpha4

commit c9216ce
Author: battlmonstr <battlmonstr@users.noreply.github.com>
Date:   Thu Jan 11 17:13:46 2024 +0100

    p2p/discv4: revert gotreply handler change from #8661 (#9119) (#9195) (#9210)

    Co-authored-by: yperbasis <andrey.ashikhmin@gmail.com>

commit d079008
Author: Andrew Ashikhmin <34320705+yperbasis@users.noreply.github.com>
Date:   Mon Jan 8 17:44:30 2024 +0100

    release: Amoy bootnodes (#9166)

    Cherry pick #9158

    ---------

    Co-authored-by: Arpit Temani <temaniarpit27@gmail.com>

commit a49fcb8
Author: Andrew Ashikhmin <34320705+yperbasis@users.noreply.github.com>
Date:   Fri Jan 5 13:03:28 2024 +0100

    release params: remove dev from version (#9143)
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.

2 participants