Skip to content

Commit b2b2b1e

Browse files
committed
Merge bitcoin#28996: test: maxuploadtarget: check for mempool msg disconnect if limit is reached, improve existing test coverage
b58f009 test: check that mempool msgs lead to disconnect if uploadtarget is reached (Sebastian Falbesoner) dd5cf38 test: check for specific disconnect reasons in feature_maxuploadtarget.py (Sebastian Falbesoner) 73d7372 test: verify `-maxuploadtarget` limit state via `getnettotals` RPC result (Sebastian Falbesoner) Pull request description: This PR improves existing and adds new test coverage for the `-maxuploadtarget` mechanism (feature_maxuploadtarget.py) in the following ways, one commit each: * verify the uploadtarget state via the `getnettotals` RPC (`uploadtarget` result field): https://github.com/bitcoin/bitcoin/blob/160d23677ad799cf9b493eaa923b2ac080c3fb8e/src/rpc/net.cpp#L581-L582 Note that reaching the total limit (`target_reached` == True) always implies that the historical blocks serving limits is also reached (`serve_historical_blocks` == False), i.e. it's impossible that both flags are set to True. * check for peer's specific disconnect reason (in this case, `"historical block serving limit reached, disconnect peer"`): https://github.com/bitcoin/bitcoin/blob/160d23677ad799cf9b493eaa923b2ac080c3fb8e/src/net_processing.cpp#L2272-L2280 * add a test for a peer disconnect if the uploadtarget is reached and a `mempool` message is received (if bloom filters are enabled): https://github.com/bitcoin/bitcoin/blob/160d23677ad799cf9b493eaa923b2ac080c3fb8e/src/net_processing.cpp#L4755-L4763 Note that another reason for disconnect after receiving a MEMPOOL msg of a peer is if bloom filters are disabled on the node. This case is already covered in the functional test `p2p_nobloomfilter_messages.py`. ACKs for top commit: maflcko: lgtm ACK b58f009 achow101: ACK b58f009 sr-gi: tACK [b58f009](bitcoin@b58f009) Tree-SHA512: 7439134129695c9c3a7ddc5e39f2ed700f91e7c91f0b7a9e0a783f275c6aa2f9918529cbfd38bb37f9139184e05e0f0354ef3c3df56da310177ec1d6b48b43d0
2 parents 0b3202d + b58f009 commit b2b2b1e

File tree

1 file changed

+45
-9
lines changed

1 file changed

+45
-9
lines changed

test/functional/feature_maxuploadtarget.py

+45-9
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
if uploadtarget has been reached.
99
* Verify that getdata requests for recent blocks are respected even
1010
if uploadtarget has been reached.
11+
* Verify that mempool requests lead to a disconnect if uploadtarget has been reached.
1112
* Verify that the upload counters are reset after 24 hours.
1213
"""
1314
from collections import defaultdict
@@ -17,6 +18,7 @@
1718
CInv,
1819
MSG_BLOCK,
1920
msg_getdata,
21+
msg_mempool,
2022
)
2123
from test_framework.p2p import P2PInterface
2224
from test_framework.test_framework import BitcoinTestFramework
@@ -27,6 +29,9 @@
2729
from test_framework.wallet import MiniWallet
2830

2931

32+
UPLOAD_TARGET_MB = 800
33+
34+
3035
class TestP2PConn(P2PInterface):
3136
def __init__(self):
3237
super().__init__()
@@ -45,12 +50,21 @@ def set_test_params(self):
4550
self.setup_clean_chain = True
4651
self.num_nodes = 1
4752
self.extra_args = [[
48-
"-maxuploadtarget=800M",
53+
f"-maxuploadtarget={UPLOAD_TARGET_MB}M",
4954
"-datacarriersize=100000",
5055
]]
5156
self.supports_cli = False
5257

58+
def assert_uploadtarget_state(self, *, target_reached, serve_historical_blocks):
59+
"""Verify the node's current upload target state via the `getnettotals` RPC call."""
60+
uploadtarget = self.nodes[0].getnettotals()["uploadtarget"]
61+
assert_equal(uploadtarget["target_reached"], target_reached)
62+
assert_equal(uploadtarget["serve_historical_blocks"], serve_historical_blocks)
63+
5364
def run_test(self):
65+
# Initially, neither historical blocks serving limit nor total limit are reached
66+
self.assert_uploadtarget_state(target_reached=False, serve_historical_blocks=True)
67+
5468
# Before we connect anything, we first set the time on the node
5569
# to be in the past, otherwise things break because the CNode
5670
# time counters can't be reset backward after initialization
@@ -93,7 +107,7 @@ def run_test(self):
93107
getdata_request = msg_getdata()
94108
getdata_request.inv.append(CInv(MSG_BLOCK, big_old_block))
95109

96-
max_bytes_per_day = 800*1024*1024
110+
max_bytes_per_day = UPLOAD_TARGET_MB * 1024 *1024
97111
daily_buffer = 144 * 4000000
98112
max_bytes_available = max_bytes_per_day - daily_buffer
99113
success_count = max_bytes_available // old_block_size
@@ -107,12 +121,16 @@ def run_test(self):
107121
assert_equal(len(self.nodes[0].getpeerinfo()), 3)
108122
# At most a couple more tries should succeed (depending on how long
109123
# the test has been running so far).
110-
for _ in range(3):
111-
p2p_conns[0].send_message(getdata_request)
112-
p2p_conns[0].wait_for_disconnect()
124+
with self.nodes[0].assert_debug_log(expected_msgs=["historical block serving limit reached, disconnect peer"]):
125+
for _ in range(3):
126+
p2p_conns[0].send_message(getdata_request)
127+
p2p_conns[0].wait_for_disconnect()
113128
assert_equal(len(self.nodes[0].getpeerinfo()), 2)
114129
self.log.info("Peer 0 disconnected after downloading old block too many times")
115130

131+
# Historical blocks serving limit is reached by now, but total limit still isn't
132+
self.assert_uploadtarget_state(target_reached=False, serve_historical_blocks=False)
133+
116134
# Requesting the current block on p2p_conns[1] should succeed indefinitely,
117135
# even when over the max upload target.
118136
# We'll try 800 times
@@ -121,12 +139,16 @@ def run_test(self):
121139
p2p_conns[1].send_and_ping(getdata_request)
122140
assert_equal(p2p_conns[1].block_receive_map[big_new_block], i+1)
123141

142+
# Both historical blocks serving limit and total limit are reached
143+
self.assert_uploadtarget_state(target_reached=True, serve_historical_blocks=False)
144+
124145
self.log.info("Peer 1 able to repeatedly download new block")
125146

126147
# But if p2p_conns[1] tries for an old block, it gets disconnected too.
127148
getdata_request.inv = [CInv(MSG_BLOCK, big_old_block)]
128-
p2p_conns[1].send_message(getdata_request)
129-
p2p_conns[1].wait_for_disconnect()
149+
with self.nodes[0].assert_debug_log(expected_msgs=["historical block serving limit reached, disconnect peer"]):
150+
p2p_conns[1].send_message(getdata_request)
151+
p2p_conns[1].wait_for_disconnect()
130152
assert_equal(len(self.nodes[0].getpeerinfo()), 1)
131153

132154
self.log.info("Peer 1 disconnected after trying to download old block")
@@ -139,23 +161,32 @@ def run_test(self):
139161
p2p_conns[2].sync_with_ping()
140162
p2p_conns[2].send_and_ping(getdata_request)
141163
assert_equal(p2p_conns[2].block_receive_map[big_old_block], 1)
164+
self.assert_uploadtarget_state(target_reached=False, serve_historical_blocks=True)
142165

143166
self.log.info("Peer 2 able to download old block")
144167

145168
self.nodes[0].disconnect_p2ps()
146169

147-
self.log.info("Restarting node 0 with download permission and 1MB maxuploadtarget")
148-
self.restart_node(0, ["[email protected]", "-maxuploadtarget=1"])
170+
self.log.info("Restarting node 0 with download permission, bloom filter support and 1MB maxuploadtarget")
171+
self.restart_node(0, ["[email protected]", "-peerbloomfilters", "-maxuploadtarget=1"])
172+
# Total limit isn't reached after restart, but 1 MB is too small to serve historical blocks
173+
self.assert_uploadtarget_state(target_reached=False, serve_historical_blocks=False)
149174

150175
# Reconnect to self.nodes[0]
151176
peer = self.nodes[0].add_p2p_connection(TestP2PConn())
152177

178+
# Sending mempool message shouldn't disconnect peer, as total limit isn't reached yet
179+
peer.send_and_ping(msg_mempool())
180+
153181
#retrieve 20 blocks which should be enough to break the 1MB limit
154182
getdata_request.inv = [CInv(MSG_BLOCK, big_new_block)]
155183
for i in range(20):
156184
peer.send_and_ping(getdata_request)
157185
assert_equal(peer.block_receive_map[big_new_block], i+1)
158186

187+
# Total limit is exceeded
188+
self.assert_uploadtarget_state(target_reached=True, serve_historical_blocks=False)
189+
159190
getdata_request.inv = [CInv(MSG_BLOCK, big_old_block)]
160191
peer.send_and_ping(getdata_request)
161192

@@ -164,6 +195,11 @@ def run_test(self):
164195
assert_equal(len(peer_info), 1) # node is still connected
165196
assert_equal(peer_info[0]['permissions'], ['download'])
166197

198+
self.log.info("Peer gets disconnected for a mempool request after limit is reached")
199+
with self.nodes[0].assert_debug_log(expected_msgs=["mempool request with bandwidth limit reached, disconnect peer"]):
200+
peer.send_message(msg_mempool())
201+
peer.wait_for_disconnect()
202+
167203
self.log.info("Test passing an unparsable value to -maxuploadtarget throws an error")
168204
self.stop_node(0)
169205
self.nodes[0].assert_start_raises_init_error(extra_args=["-maxuploadtarget=abc"], expected_msg="Error: Unable to parse -maxuploadtarget: 'abc'")

0 commit comments

Comments
 (0)