Limit incoming connections. #8060

arkpar · 2018-03-05T14:39:57Z

This limits incoming connections to max(max_peers - min_peers, min_peers / 2)
effectively reserving at least min_peers / 2 connections to be outbound.

Needs careful review and testing on a machine that can accept connections.

kirushik · 2018-03-05T15:38:26Z

util/network-devp2p/src/host.rs

@@ -566,7 +574,7 @@ impl Host {
 			self.connect_peer(&id, io);
 			started += 1;
 		}
-		debug!(target: "network", "Connecting peers: {} sessions, {} pending, {} started", self.session_count(), self.handshake_count(), started);
+		debug!(target: "network", "Connecting peers: {} sessions, {} pending, {} started", egress_count + ingress_count, self.handshake_count(), started);


Why not calling a variable handshake_count? Calling a method initiates another iteration of session_count().

kirushik

Looks good (and requires some thorough real-world testing, which I didn't do), except for that minor effectiveness issue.

kirushik · 2018-03-05T16:57:25Z

Please don't forget to battle-test this on nightly before backporting to other release channels (which, I think, we should do eventually).

andresilva

LGTM! 👍

andresilva · 2018-03-06T19:03:01Z

util/network-devp2p/src/host.rs

@@ -707,12 +710,17 @@ impl Host {
 								(info.config.min_peers as usize, max_peers as usize, info.config.non_reserved_mode == NonReservedPeerMode::Deny, info.id().clone())
 							};

+							max_peers = max(max_peers, min_peers);


Why is this needed? (assuming we validate in the config that max_peers >= min_peers)

Just another sanity check, so that this code does not rely on config.

andresilva · 2018-03-06T19:07:23Z

I'll test this tomorrow once I have a proper internet connection.

andresilva · 2018-03-07T17:34:01Z

This is working properly for me.

ddorgan · 2018-03-09T14:53:34Z

@arkpar @andresilva I installed master on a boot node and only had about 11 peers after 30 minutes. When I reverted to 1.8.4 it got 18 peers straight away.

Is there logs or debug info I can provide to you on this?

BTW the node is running with these options:

parity --chain kovan --log-file parity.log --auto-update=all --no-dapps --no-ui --max-peers 500 --snapshot-peers 1200 --pruning-history 1200   --jsonrpc-apis web3,eth,parity,parity_set,net,traces,rpc --no-warp --allow-ips public

* Limit ingress connections * Optimized handshakes logging

* updater: apply exponential backoff after download failure (#8059) * updater: apply exponential backoff after download failure * updater: reset backoff on new release * Limit incoming connections. (#8060) * Limit ingress connections * Optimized handshakes logging * Max code size on Kovan (#8067) * Enable code size limit on kovan * Fix formatting. * add some dos protection (#8084) * more dos protection (#8104) * Const time comparison (#8113) * Use `subtle::slices_equal` for constant time comparison. Also update the existing version of subtle in `ethcrypto` from 0.1 to 0.5 * Test specifically for InvalidPassword error. * revert removing blooms (#8066) * Revert "fix traces, removed bloomchain crate, closes #7228, closes #7167" This reverts commit 1bf6203. * Revert "fixed broken logs (#7934)" This reverts commit f8a2e53. * fixed broken logs * bring back old lock order * remove migration v13 * revert CURRENT_VERSION to 12 in migration.rs * Fix compilation. * Check one step deeper if we're on release track branches * add missing pr * Fix blooms? * Fix tests compiilation. * Fix size.

* Limit ingress connections * Optimized handshakes logging

* Support parity protocol. (#8035) * updater: apply exponential backoff after download failure (#8059) * updater: apply exponential backoff after download failure * updater: reset backoff on new release * Max code size on Kovan (#8067) * Enable code size limit on kovan * Fix formatting. * Limit incoming connections. (#8060) * Limit ingress connections * Optimized handshakes logging * WASM libraries bump (#7970) * update wasmi, parity-wasm, wasm-utils to latest version * Update to new wasmi & error handling * also utilize new stack limiter * fix typo * replace dependency url * Cargo.lock update * add some dos protection (#8084) * revert removing blooms (#8066) * Revert "fix traces, removed bloomchain crate, closes #7228, closes #7167" This reverts commit 1bf6203. * Revert "fixed broken logs (#7934)" This reverts commit f8a2e53. * fixed broken logs * bring back old lock order * remove migration v13 * revert CURRENT_VERSION to 12 in migration.rs * more dos protection (#8104) * Const time comparison (#8113) * Use `subtle::slices_equal` for constant time comparison. Also update the existing version of subtle in `ethcrypto` from 0.1 to 0.5 * Test specifically for InvalidPassword error. * fix trace filter returning returning unrelated reward calls, closes #8070 (#8098) * network: init discovery using healthy nodes (#8061) * network: init discovery using healthy nodes * network: fix style grumble * network: fix typo * Postpone Kovan hard fork (#8137) * ethcore: postpone Kovan hard fork * util: update version fork metadata * Disable UI by default. (#8105) * dapps: update parity-ui dependencies (#8160)

Limit ingress connections

e732a67

arkpar added A0-pleasereview 🤓 Pull request needs code review. M4-core ⛓ Core client code / Rust. labels Mar 5, 2018

5chdn added the B0-patch label Mar 5, 2018

5chdn added this to the 1.11 milestone Mar 5, 2018

kirushik reviewed Mar 5, 2018

View reviewed changes

kirushik approved these changes Mar 5, 2018

View reviewed changes

kirushik added A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. and removed A0-pleasereview 🤓 Pull request needs code review. labels Mar 5, 2018

Optimized handshakes logging

5b171c2

arkpar added A0-pleasereview 🤓 Pull request needs code review. and removed A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. labels Mar 5, 2018

kirushik approved these changes Mar 5, 2018

View reviewed changes

kirushik added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Mar 5, 2018

andresilva approved these changes Mar 6, 2018

View reviewed changes

kirushik merged commit e810601 into master Mar 9, 2018

tomusdrw deleted the net-ingress-fix branch March 16, 2018 12:45

tomusdrw pushed a commit that referenced this pull request Mar 16, 2018

Limit incoming connections. (#8060)

638f5d1

* Limit ingress connections * Optimized handshakes logging

tomusdrw mentioned this pull request Mar 16, 2018

[stable] Backports #8133

Merged

9 tasks

andresilva pushed a commit that referenced this pull request Mar 16, 2018

Limit incoming connections. (#8060)

ba457a9

* Limit ingress connections * Optimized handshakes logging

andresilva mentioned this pull request Mar 16, 2018

[Beta] Backports #8136

Merged

14 tasks

andresilva pushed a commit that referenced this pull request Mar 19, 2018

Limit incoming connections. (#8060)

2b73a64

* Limit ingress connections * Optimized handshakes logging

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Limit incoming connections. #8060

Limit incoming connections. #8060

arkpar commented Mar 5, 2018 •

edited

Loading

kirushik Mar 5, 2018 •

edited

Loading

kirushik left a comment

kirushik commented Mar 5, 2018

andresilva left a comment

andresilva Mar 6, 2018

arkpar Mar 7, 2018

andresilva commented Mar 6, 2018

andresilva commented Mar 7, 2018

ddorgan commented Mar 9, 2018

Limit incoming connections. #8060

Limit incoming connections. #8060

Conversation

arkpar commented Mar 5, 2018 • edited Loading

kirushik Mar 5, 2018 • edited Loading

Choose a reason for hiding this comment

kirushik left a comment

Choose a reason for hiding this comment

kirushik commented Mar 5, 2018

andresilva left a comment

Choose a reason for hiding this comment

andresilva Mar 6, 2018

Choose a reason for hiding this comment

arkpar Mar 7, 2018

Choose a reason for hiding this comment

andresilva commented Mar 6, 2018

andresilva commented Mar 7, 2018

ddorgan commented Mar 9, 2018

arkpar commented Mar 5, 2018 •

edited

Loading

kirushik Mar 5, 2018 •

edited

Loading