test: Fix verack race to avoid intermittent test failures #18866

pull MarcoFalke wants to merge 1 commits into bitcoin:master from MarcoFalke:2005-qaVerackRace changing 1 files +5 −1

MarcoFalke commented at 12:56 PM on May 4, 2020: member

Fixes #18832
test: Fix verack race to avoid intermittent test failures fae153b409
MarcoFalke force-pushed on May 4, 2020
laanwj added the label P2P on May 4, 2020
laanwj added the label Tests on May 4, 2020
laanwj removed the label P2P on May 4, 2020

in test/functional/test_framework/util.py:398 in fae153b409

 390 | @@ -391,7 +391,11 @@ def connect_nodes(from_connection, node_num):
 391 |      from_connection.addnode(ip_port, "onetry")
 392 |      # poll until version handshake complete to avoid race conditions
 393 |      # with transaction relaying
 394 | -    wait_until(lambda:  all(peer['version'] != 0 for peer in from_connection.getpeerinfo()))
 395 | +    # See comments in net_processing:
 396 | +    # * Must have a version message before anything else
 397 | +    # * Must have a verack message before anything else
 398 | +    wait_until(lambda: all(peer['version'] != 0 for peer in from_connection.getpeerinfo()))
 399 | +    wait_until(lambda: all(peer['bytesrecv_per_msg'].pop('verack', 0) == 24 for peer in from_connection.getpeerinfo()))

laanwj commented at 10:37 AM on May 6, 2020:

It's slightly hacky to use the receive statistics here to see if the local peer has received the verack message and completed the handshake. But the only way to do it without RPC changes, I suppose.

MarcoFalke commented at 3:09 PM on May 6, 2020:

There is fSuccessfullyConnected or so, which should do the same thing, but yeah it is not exposed on RPC

laanwj commented at 10:38 AM on May 6, 2020: member

ACK fae153b40968bfd974a4709bcd841a59447abf18
MarcoFalke merged this on May 8, 2020
MarcoFalke closed this on May 8, 2020
MarcoFalke deleted the branch on May 8, 2020
sidhujag referenced this in commit 231392771c on May 12, 2020
ComputerCraftr referenced this in commit 28a494d680 on Jun 10, 2020
ComputerCraftr referenced this in commit 45df3f5020 on Jun 10, 2020
jasonbcox referenced this in commit a73453dd27 on Sep 12, 2020
PastaPastaPasta referenced this in commit 190726ad49 on Jun 27, 2021
PastaPastaPasta referenced this in commit fd6a732710 on Jun 28, 2021
PastaPastaPasta referenced this in commit 7de0956a4c on Jun 29, 2021
PastaPastaPasta referenced this in commit 608772114f on Jul 1, 2021
PastaPastaPasta referenced this in commit 7c1ea4174a on Jul 1, 2021
PastaPastaPasta referenced this in commit be891457d1 on Jul 14, 2021
PastaPastaPasta referenced this in commit 8c1a763ccc on Jul 15, 2021
DrahtBot locked this on Feb 15, 2022

Contributors

MarcoFalke

laanwj

Labels

Tests

Linked (view graph)

#18832 intermittent failure in mempool_unbroadcast "Mempool sync timed out after 30s"