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

Backport eosio/eos 2.1 version of net_plugin #169

Merged
merged 3 commits into from
May 14, 2022
Merged

Backport eosio/eos 2.1 version of net_plugin #169

merged 3 commits into from
May 14, 2022

Conversation

heifner
Copy link
Member

@heifner heifner commented May 1, 2022 •
edited
Loading

@heifner heifner marked this pull request as ready for review May 2, 2022 23:07
@heifner heifner mentioned this pull request May 2, 2022
Closed
@spoonincode
Copy link
Member

I'm not really sure how to approach reviewing this. I originally started looking it as a diff from 2.1 vs Mandel and then backing out changes from that diff that are included in mandel via other PRs (like #56) but this was still unwieldy to really grok. I've at least run a node connected to some mainnet peers and all seems well. Anything specific that would be interesting to double check?

@heifner
Copy link
Member Author

heifner commented May 7, 2022

I've at least run a node connected to some mainnet peers and all seems well. Anything specific that would be interesting to double check?

That is the main thing. This PR includes special handling to "lie" to eosio/eos 2.1 nodes telling them it is an eosio/eos 2.0 node because Mandel does not understand eosio/eos 2.1 packed_transaction or signed_block. We have many integration tests that test Mandel <-> Mandel. But no multi-version tests at this time. I Also verified manually it would sync from a 2.1 and that a 2.1 would sync from it.

jgiszczak
jgiszczak approved these changes May 10, 2022
View reviewed changes
spoonincode
spoonincode suggested changes May 10, 2022
View reviewed changes
Copy link
Member

@spoonincode spoonincode left a comment

Choose a reason for hiding this comment

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

hold up

@heifner heifner added the OCI OCI working this issue... label May 12, 2022
spoonincode
spoonincode reviewed May 13, 2022
View reviewed changes
plugins/net_plugin/net_plugin.cpp Outdated
}
uint32_t num = ++peer_requested->last;
if(num == peer_requested->end_block) {
peer_requested.reset();
fc_ilog( logger, "completing enqueue_sync_block ${num} to ${p}", ("num", num)("p", peer_name()) );
peer_ilog( this, "completing enqueue_sync_block ${num}", ("num", num) );
Copy link
Member

Choose a reason for hiding this comment

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

This log is rather chatty. I guess I (normally) don't have any nodes syncing from me to have noticed before. Is it important to log every time some node requests some blocks from me?

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll change that to peer_dlog, does seem to be a bit chatty.

spoonincode
spoonincode approved these changes May 13, 2022
View reviewed changes
Copy link
Member

@spoonincode spoonincode left a comment

Choose a reason for hiding this comment

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

Been playing around with different combinations of nodeos versions connected to each other. Never saw any issues.

@heifner
Changed to peer_dlog to cut down on default log output.
45f4269 
Changed to use message_header_size to simplify the code.
@heifner heifner requested a review from jgiszczak May 13, 2022 23:03
@heifner heifner merged commit ee457ba into main May 14, 2022
@heifner heifner deleted the net-plugin-2.1 branch May 14, 2022 02:17
@oschwaldp-oci oschwaldp-oci mentioned this pull request May 17, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spoonincode spoonincode spoonincode approved these changes

@jgiszczak jgiszczak Awaiting requested review from jgiszczak

Assignees
No one assigned
Labels
OCI OCI working this issue...
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

backport: p2p timeout from 2.1
3 participants
@heifner @spoonincode @jgiszczak