The test may fail intermittently when the net thread is lagging while calling DeleteNode. This may result in a split getdata, meaning that peer2.wait_for_parent_requests([int(parent_peekaboo_AB["txid"], 16), int(parent_missing["txid"], 16)]) fails.
Fix it by adding a sync on the net thread.
Fixes #31700
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/32092.
See the guideline for information on the review process.
| Type | Reviewers |
|---|---|
| ACK | mzumsande |
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
Can be tested by the diff provided by @tnndbtc in #32063 (comment) (thanks!):
0diff --git a/src/net.cpp b/src/net.cpp
1index 735985a841..2bb6db0cf7 100644
2--- a/src/net.cpp
3+++ b/src/net.cpp
4@@ -1965,6 +1965,9 @@ void CConnman::DisconnectNodes()
5 // Destroy the object only after other threads have stopped using it.
6 if (pnode->GetRefCount() <= 0) {
7 m_nodes_disconnected.remove(pnode);
8+
9+ std::this_thread::sleep_for(std::chrono::seconds(1)); // SLEEP for 1 second to 100% reproduce the issue
10+
11 DeleteNode(pnode);
12 }
13 }
788@@ -789,6 +789,7 @@ def test_parents_change(self):
789 # Disconnect peer1. peer2 should become the new candidate for orphan resolution.
790 peer1.peer_disconnect()
791 self.wait_until(lambda: node.num_test_p2p_connections() == 1)
792+ peer2.sync_with_ping() # Sync with the 'net' thread which completes the disconnection fully
793 node.bumpmocktime(TXREQUEST_TIME_SKIP)
disconnect_p2ps that the wait there does not guarantee that the resources of all nodes (such as outstanding txrequests) are cleared.
