phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge bitcoin/bitcoin#32101: Accept unordered tracepoints in interface_usdt_utxocache.py

Browse source 
248fdd88dc test: accept unordered tracepoints in... (willcl-ark)

Pull request description:

  We have encountered an instance where the tracepoints were not collected in the same order they were fired (#31951).

  Tracepoint ordering is not guaranteed in userspace for a number of reasons.

  As this test does not require a strict collection/processing order collect `expected` and `actual` events into dicts and compare them.

  This will gracefully handle both the number of events, and out-of-order events should they reoccur in the future.

  Fixes: #31951

ACKs for top commit:
  0xB10C:
    re-ACK 248fdd88dc
  laanwj:
    Code review ACK 248fdd88dc

Tree-SHA512: 78d1aa936194d386d919ed26133aac3af5fc6d3d0b1fe1e767288d9e6226e2c701d640e71e994a63ccd48344bd2a0db508cb353cdd5ce1f644cd6f7313654623
This commit is contained in:
merge-script 2025-03-27 15:50:57 +08:00
commit b131e1bfc0
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
test/functional/interface_usdt_utxocache.py
View file

@ -265,14 +265,6 @@ class UTXOCacheTracepointTest(BitcoinTestFramework):
actual_utxocache_adds = []
actual_utxocache_spents = []
def compare_utxo_with_event(utxo, event):
"""Compare a utxo dict to the event produced by BPF"""
assert_equal(utxo["txid"], bytes(event.txid[::-1]).hex())
assert_equal(utxo["index"], event.index)
assert_equal(utxo["height"], event.height)
assert_equal(utxo["value"], event.value)
assert_equal(utxo["is_coinbase"], event.is_coinbase)
def handle_utxocache_add(_, data, __):
event = ctypes.cast(data, ctypes.POINTER(UTXOCacheChange)).contents
self.log.info(f"handle_utxocache_add(): {event}")
@ -324,9 +316,28 @@ class UTXOCacheTracepointTest(BitcoinTestFramework):
self.log.info(
f"check that we successfully traced {EXPECTED_HANDLE_ADD_SUCCESS} adds and {EXPECTED_HANDLE_SPENT_SUCCESS} spent")
for expected_utxo, actual_event in zip(expected_utxocache_adds + expected_utxocache_spents,
actual_utxocache_adds + actual_utxocache_spents):
compare_utxo_with_event(expected_utxo, actual_event)
# Check that all expected tracepoints are recieved, but not the order they were recieved in.
# Tracepoint ordering is not strictly guaranteed, so this comparison avoids intermittent failures in the test.
def cache_event_to_key(event):
return (
bytes(event.txid[::-1]).hex(),
event.index,
event.height,
event.value,
event.is_coinbase
)
expected_add_keys = {(e["txid"], e["index"], e["height"], e["value"], e["is_coinbase"])
for e in expected_utxocache_adds}
expected_spent_keys = {(e["txid"], e["index"], e["height"], e["value"], e["is_coinbase"])
for e in expected_utxocache_spents}
actual_add_keys = {cache_event_to_key(e) for e in actual_utxocache_adds}
actual_spent_keys = {cache_event_to_key(e) for e in actual_utxocache_spents}
assert_equal(expected_add_keys, actual_add_keys)
assert_equal(expected_spent_keys, actual_spent_keys)
bpf.cleanup()