net_version caches network_id to avoid redundant aquire of sync read lock #9544

debris · 2018-09-12T20:14:31Z

This pull request does not resolve the underlying issue with net_version rpc method, but it is simply trying to workaround the problem. We should backport it and see if the issue with net_version still exists.

If it does, it is caused by rpc library and we should fix the problem over there.

If it does not, we should fix sync.status() locking and/or all other rpc methods that do not respond immediately

…lock, #8746

niklasad1 · 2018-09-12T21:55:15Z

rpc/src/v1/impls/net.rs

 	}

 	fn peer_count(&self) -> Result<String> {
-		Ok(format!("0x{:x}", self.sync.status().num_peers as u64).to_owned())
+		Ok(format!("0x{:x}", self.sync.status().num_peers as u64))


use {:#x} instead of 0x{:x}

This is probably also pretty slow, we could maybe exposes a specific method to return only number of peers (best would be if it didnt require locking at all) - but it's a separate issue.

@tomusdrw definitely, but let's fix it in a separate pr :)

@tomusdrw
Just so I understand this, do you mean to return like u64 instead of a String here to get rid of allocation including probably something like itoa under the hood to convert the integer to ascii/unicode?

I'm pretty sure @tomusdrw was talking about accessing sync.status() object which aquires lock :)

^^ that @niklasad1 :)

tomusdrw · 2018-09-13T04:51:51Z

rpc/src/v1/impls/net.rs

 	}

 	fn peer_count(&self) -> Result<String> {
-		Ok(format!("0x{:x}", self.sync.status().num_peers as u64).to_owned())
+		Ok(format!("0x{:x}", self.sync.status().num_peers as u64))


This is probably also pretty slow, we could maybe exposes a specific method to return only number of peers (best would be if it didnt require locking at all) - but it's a separate issue.

dvdplm

Let's try it, lgtm

…lock (#9544) * net_version caches network_id to avoid redundant aquire of sync read lock, #8746 * use lower_hex display formatting for net_peerCount rpc method

* parity-version: mark 2.0.5 track stable * deps: bump fs-swap to 0.2.4 * Remove initial token for WS. (#9545) * version: mark release critical * Increase Gas-floor-target and Gas Cap (#9564) + Gas-floor-target increased to 8M by default + Gas-cap increased to 10M by default * Improve P2P discovery (#9526) * Add `target` to Rust traces * network-devp2p: Don't remove discovery peer in main sync * network-p2p: Refresh discovery more often * Update Peer discovery protocol * Run discovery more often when not enough nodes connected * Start the first discovery early * Update fast discovery rate * Fix tests * Fix `ping` tests * Fixing remote Node address ; adding PingPong round * Fix tests: update new +1 PingPong round * Increase slow Discovery rate Check in flight FindNode before pings * Add `deprecated` to deprecated_echo_hash * Refactor `discovery_round` branching * net_version caches network_id to avoid redundant aquire of sync read lock (#9544) * net_version caches network_id to avoid redundant aquire of sync read lock, #8746 * use lower_hex display formatting for net_peerCount rpc method

* parity-version: mark 2.1.0 track beta * ci: update branch version references * docker: release master to latest * Fix checkpointing when creating contract failed (#9514) * ci: fix json docs generation (#9515) * fix typo in version string (#9516) * Update patricia trie to 0.2.2 crates. Default dependencies on minor version only. * Putting back ethereum tests to the right commit * Enable all Constantinople hard fork changes in constantinople_test.json (#9505) * Enable all Constantinople hard fork changes in constantinople_test.json * Address grumbles * Remove EIP-210 activation * 8m -> 5m * Temporarily add back eip210 transition so we can get test passed * Add eip210_test and remove eip210 transition from const_test * In create memory calculation is the same for create2 because the additional parameter was popped before. (#9522) * deps: bump fs-swap and kvdb-rocksdb * Multithreaded snapshot creation (#9239) * Add Progress to Snapshot Secondary chunks creation * Use half of CPUs to multithread snapshot creation * Use env var to define number of threads * info to debug logs * Add Snapshot threads as CLI option * Randomize chunks per thread * Remove randomness, add debugging * Add warning * Add tracing * Use parity-common fix seek branch * Fix log * Fix tests * Fix tests * PR Grumbles * PR Grumble II * Update Cargo.lock * PR Grumbles * Default snapshot threads to half number of CPUs * Fix default snapshot threads // min 1 * correct before_script for nightly build versions (#9543) - fix gitlab array of strings syntax error - get proper commit id - avoid colon in stings * Remove initial token for WS. (#9545) * version: mark release critical * ci: fix rpc docs generation 2 (#9550) * Improve P2P discovery (#9526) * Add `target` to Rust traces * network-devp2p: Don't remove discovery peer in main sync * network-p2p: Refresh discovery more often * Update Peer discovery protocol * Run discovery more often when not enough nodes connected * Start the first discovery early * Update fast discovery rate * Fix tests * Fix `ping` tests * Fixing remote Node address ; adding PingPong round * Fix tests: update new +1 PingPong round * Increase slow Discovery rate Check in flight FindNode before pings * Add `deprecated` to deprecated_echo_hash * Refactor `discovery_round` branching * net_version caches network_id to avoid redundant aquire of sync read lock (#9544) * net_version caches network_id to avoid redundant aquire of sync read lock, #8746 * use lower_hex display formatting for net_peerCount rpc method * Increase Gas-floor-target and Gas Cap (#9564) + Gas-floor-target increased to 8M by default + Gas-cap increased to 10M by default * Revert to old parity-tokio-ipc. * Downgrade named pipes.

net_version caches network_id to avoid redundant aquire of sync read …

261b8c7

…lock, #8746

debris added A0-pleasereview 🤓 Pull request needs code review. B0-patchthis 🕷 M4-core ⛓ Core client code / Rust. M6-rpcapi 📣 RPC API. labels Sep 12, 2018

debris requested review from dvdplm and tomusdrw September 12, 2018 20:14

niklasad1 reviewed Sep 12, 2018

View reviewed changes

tomusdrw approved these changes Sep 13, 2018

View reviewed changes

tomusdrw added A6-mustntgrumble 💦 Pull request has areas for improvement. The author need not address them before merging. and removed A0-pleasereview 🤓 Pull request needs code review. labels Sep 13, 2018

use lower_hex display formatting for net_peerCount rpc method

cf96a03

dvdplm approved these changes Sep 13, 2018

View reviewed changes

5chdn merged commit 6b39131 into master Sep 13, 2018

5chdn deleted the net_version_cache branch September 13, 2018 08:16

5chdn added this to the 2.2 milestone Sep 14, 2018

5chdn mentioned this pull request Sep 14, 2018

Backports for 2.1.0 beta #9518

Merged

21 tasks

debris mentioned this pull request Sep 17, 2018

Backports for 2.0.5 stable #9519

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

net_version caches network_id to avoid redundant aquire of sync read lock #9544

net_version caches network_id to avoid redundant aquire of sync read lock #9544

debris commented Sep 12, 2018

niklasad1 Sep 12, 2018

tomusdrw Sep 13, 2018

debris Sep 13, 2018

niklasad1 Sep 13, 2018

debris Sep 13, 2018

tomusdrw Sep 13, 2018

tomusdrw Sep 13, 2018

dvdplm left a comment

net_version caches network_id to avoid redundant aquire of sync read lock #9544

net_version caches network_id to avoid redundant aquire of sync read lock #9544

Conversation

debris commented Sep 12, 2018

niklasad1 Sep 12, 2018

Choose a reason for hiding this comment

tomusdrw Sep 13, 2018

Choose a reason for hiding this comment

debris Sep 13, 2018

Choose a reason for hiding this comment

niklasad1 Sep 13, 2018

Choose a reason for hiding this comment

debris Sep 13, 2018

Choose a reason for hiding this comment

tomusdrw Sep 13, 2018

Choose a reason for hiding this comment

tomusdrw Sep 13, 2018

Choose a reason for hiding this comment

dvdplm left a comment

Choose a reason for hiding this comment