grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Secret store: fix Instant::now() related race in net_keep_alive (#11155)

Browse Source 
* try Instant fix in SS

* proper fix + add comment

* fix compilation
This commit is contained in:
Svyatoslav Nikolsky 2019-10-10 11:19:23 +03:00 committed by GitHub
parent 93fbbb9aaf
commit 330cdc1a4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
secret-store/src/key_server_cluster/cluster_connections_net.rs
View File

@ -467,10 +467,13 @@ fn net_maintain(data: Arc<NetConnectionsData>) {
/// Send keep alive messages to remote nodes. /// Send keep alive messages to remote nodes.
fn net_keep_alive(data: Arc<NetConnectionsData>) { fn net_keep_alive(data: Arc<NetConnectionsData>) {
let now = Instant::now();
let active_connections = data.active_connections(); let active_connections = data.active_connections();
for connection in active_connections { for connection in active_connections {
let last_message_diff = now - connection.last_message_time(); // the last_message_time could change after active_connections() call
// => we always need to call Instant::now() after getting last_message_time
let last_message_time = connection.last_message_time();
let now = Instant::now();
let last_message_diff = now - last_message_time;
if last_message_diff > KEEP_ALIVE_DISCONNECT_INTERVAL { if last_message_diff > KEEP_ALIVE_DISCONNECT_INTERVAL {
warn!(target: "secretstore_net", "{}: keep alive timeout for node {}", warn!(target: "secretstore_net", "{}: keep alive timeout for node {}",
data.self_key_pair.public(), connection.node_id()); data.self_key_pair.public(), connection.node_id());