Page MenuHomePhabricator
Differential D16233

txorphanage: make m_peer_work_set private
ClosedPublic
Actions

Authored by Fabien on May 28 2024, 13:52.

Details

Reviewers
PiRK
Group Reviewers
Restricted Project
Commits
rABC594e0d9ee5b6: txorphanage: make m_peer_work_set private
Summary

Partial backport of core#26295:
https://github.com/bitcoin/bitcoin/pull/26295/commits/a936f41a5d5f7bb97425f82ec64dfae62e840a56

Depends on D16232.

Test Plan
ninja all check-all

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

Fabien created this revision.May 28 2024, 13:52
Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 28 2024, 13:52
Fabien requested review of this revision.May 28 2024, 13:52
teamcity edited the summary of this revision. (Show Details)May 28 2024, 13:52
Fabien added a child revision: D16234: Move all g_cs_orphans locking to txorphanage.May 28 2024, 13:58
Harbormaster completed remote builds in B29146: Diff 47989.May 28 2024, 15:21
teamcity added a comment.May 28 2024, 15:22
Build Bitcoin ABC Diffs / Diff Testing (build-debug) failed.

Failed tests logs:

====== Bitcoin ABC functional tests: p2p_compactblocks.py ======

------- Stdout: -------
2024-05-28T15:18:09.587000Z TestFramework (INFO): Initializing test directory /work/abc-ci-builds/build-debug/test/tmp/test_runner_₿₵_  _20240528_151236/p2p_compactblocks_83
2024-05-28T15:18:10.631000Z TestFramework (INFO): Testing SENDCMPCT p2p message... 
2024-05-28T15:18:11.191000Z TestFramework (INFO): Testing compactblock construction...
2024-05-28T15:18:13.987000Z TestFramework (INFO): Testing compactblock requests... 
2024-05-28T15:18:14.296000Z TestFramework (INFO): Testing getblocktxn requests...
2024-05-28T15:18:14.818000Z TestFramework (INFO): Testing getblocktxn handler...
2024-05-28T15:18:15.446000Z TestFramework (INFO): Testing compactblock requests/announcements not at chain tip...
2024-05-28T15:18:15.701000Z TestFramework (INFO): Testing handling of low-work compact blocks...
2024-05-28T15:18:15.756000Z TestFramework (INFO): Testing handling of incorrect blocktxn responses...
2024-05-28T15:18:15.964000Z TestFramework (INFO): Testing end-to-end block relay...
2024-05-28T15:18:16.127000Z TestFramework (INFO): Testing handling of invalid compact blocks...
2024-05-28T15:18:16.231000Z TestFramework (INFO): Testing reconstructing compact blocks from all peers...
2024-05-28T15:18:16.336000Z TestFramework (ERROR): Assertion failed
Traceback (most recent call last):
  File "/work/test/functional/test_framework/test_framework.py", line 147, in main
    self._run_test_internal()
  File "/work/test/functional/test_framework/test_framework.py", line 137, in _run_test_internal
    self.run_test()
  File "/work/test/functional/p2p_compactblocks.py", line 926, in run_test
    self.test_compactblock_reconstruction_multiple_peers(
  File "/work/test/functional/p2p_compactblocks.py", line 826, in test_compactblock_reconstruction_multiple_peers
    assert tx.hash in mempool
AssertionError
2024-05-28T15:18:16.387000Z TestFramework (INFO): Stopping nodes
2024-05-28T15:18:16.538000Z TestFramework (WARNING): Not cleaning up dir /work/abc-ci-builds/build-debug/test/tmp/test_runner_₿₵_  _20240528_151236/p2p_compactblocks_83
2024-05-28T15:18:16.538000Z TestFramework (ERROR): Test failed. Test logging available at /work/abc-ci-builds/build-debug/test/tmp/test_runner_₿₵_  _20240528_151236/p2p_compactblocks_83/test_framework.log
2024-05-28T15:18:16.538000Z TestFramework (ERROR): 
2024-05-28T15:18:16.538000Z TestFramework (ERROR): Hint: Call /work/test/functional/combine_logs.py '/work/abc-ci-builds/build-debug/test/tmp/test_runner_₿₵_  _20240528_151236/p2p_compactblocks_83' to consolidate all logs
2024-05-28T15:18:16.538000Z TestFramework (ERROR): 
2024-05-28T15:18:16.538000Z TestFramework (ERROR): If this failure happened unexpectedly or intermittently, please file a bug and provide a link or upload of the combined log.
2024-05-28T15:18:16.538000Z TestFramework (ERROR): https://github.com/Bitcoin-ABC/bitcoin-abc/issues
2024-05-28T15:18:16.538000Z TestFramework (ERROR):

Each failure log is accessible here:
Bitcoin ABC functional tests: p2p_compactblocks.py

Fabien added a comment.May 28 2024, 15:44

I restarted the build. I'm investigating the failure which is unrelated.

PiRK accepted this revision.May 28 2024, 16:18
This revision is now accepted and ready to land.May 28 2024, 16:18
teamcity added a comment.May 28 2024, 16:23
Build Bitcoin ABC Diffs / Diff Testing (build-diff) failed.

Failed tests logs:

====== Bitcoin ABC functional tests: p2p_compactblocks.py ======

------- Stdout: -------
2024-05-28T16:13:45.250000Z TestFramework (INFO): Initializing test directory /work/abc-ci-builds/build-diff/test/tmp/test_runner_₿₵_  _20240528_160841/p2p_compactblocks_83
2024-05-28T16:13:46.422000Z TestFramework (INFO): Testing SENDCMPCT p2p message... 
2024-05-28T16:13:46.969000Z TestFramework (INFO): Testing compactblock construction...
2024-05-28T16:13:51.354000Z TestFramework (INFO): Testing compactblock requests... 
2024-05-28T16:13:51.681000Z TestFramework (INFO): Testing getblocktxn requests...
2024-05-28T16:13:52.249000Z TestFramework (INFO): Testing getblocktxn handler...
2024-05-28T16:13:52.901000Z TestFramework (INFO): Testing compactblock requests/announcements not at chain tip...
2024-05-28T16:13:53.208000Z TestFramework (INFO): Testing handling of low-work compact blocks...
2024-05-28T16:13:53.272000Z TestFramework (INFO): Testing handling of incorrect blocktxn responses...
2024-05-28T16:13:53.496000Z TestFramework (INFO): Testing end-to-end block relay...
2024-05-28T16:13:53.651000Z TestFramework (INFO): Testing handling of invalid compact blocks...
2024-05-28T16:13:53.765000Z TestFramework (INFO): Testing reconstructing compact blocks from all peers...
2024-05-28T16:13:53.881000Z TestFramework (ERROR): Assertion failed
Traceback (most recent call last):
  File "/work/test/functional/test_framework/test_framework.py", line 147, in main
    self._run_test_internal()
  File "/work/test/functional/test_framework/test_framework.py", line 137, in _run_test_internal
    self.run_test()
  File "/work/test/functional/p2p_compactblocks.py", line 926, in run_test
    self.test_compactblock_reconstruction_multiple_peers(
  File "/work/test/functional/p2p_compactblocks.py", line 826, in test_compactblock_reconstruction_multiple_peers
    assert tx.hash in mempool
AssertionError
2024-05-28T16:13:53.935000Z TestFramework (INFO): Stopping nodes
2024-05-28T16:13:54.287000Z TestFramework (WARNING): Not cleaning up dir /work/abc-ci-builds/build-diff/test/tmp/test_runner_₿₵_  _20240528_160841/p2p_compactblocks_83
2024-05-28T16:13:54.288000Z TestFramework (ERROR): Test failed. Test logging available at /work/abc-ci-builds/build-diff/test/tmp/test_runner_₿₵_  _20240528_160841/p2p_compactblocks_83/test_framework.log
2024-05-28T16:13:54.288000Z TestFramework (ERROR): 
2024-05-28T16:13:54.288000Z TestFramework (ERROR): Hint: Call /work/test/functional/combine_logs.py '/work/abc-ci-builds/build-diff/test/tmp/test_runner_₿₵_  _20240528_160841/p2p_compactblocks_83' to consolidate all logs
2024-05-28T16:13:54.289000Z TestFramework (ERROR): 
2024-05-28T16:13:54.289000Z TestFramework (ERROR): If this failure happened unexpectedly or intermittently, please file a bug and provide a link or upload of the combined log.
2024-05-28T16:13:54.289000Z TestFramework (ERROR): https://github.com/Bitcoin-ABC/bitcoin-abc/issues
2024-05-28T16:13:54.289000Z TestFramework (ERROR):
====== Bitcoin ABC functional tests with the next upgrade activated: p2p_compactblocks.py ======

------- Stdout: -------
2024-05-28T16:20:05.129000Z TestFramework (INFO): Initializing test directory /work/abc-ci-builds/build-diff/test/tmp/test_runner_₿₵_  _20240528_161541/p2p_compactblocks_83
2024-05-28T16:20:06.232000Z TestFramework (INFO): Testing SENDCMPCT p2p message... 
2024-05-28T16:20:06.765000Z TestFramework (INFO): Testing compactblock construction...
2024-05-28T16:20:10.075000Z TestFramework (INFO): Testing compactblock requests... 
2024-05-28T16:20:10.387000Z TestFramework (INFO): Testing getblocktxn requests...
2024-05-28T16:20:10.913000Z TestFramework (INFO): Testing getblocktxn handler...
2024-05-28T16:20:11.591000Z TestFramework (INFO): Testing compactblock requests/announcements not at chain tip...
2024-05-28T16:20:11.904000Z TestFramework (INFO): Testing handling of low-work compact blocks...
2024-05-28T16:20:11.968000Z TestFramework (INFO): Testing handling of incorrect blocktxn responses...
2024-05-28T16:20:12.200000Z TestFramework (INFO): Testing end-to-end block relay...
2024-05-28T16:20:12.376000Z TestFramework (INFO): Testing handling of invalid compact blocks...
2024-05-28T16:20:12.489000Z TestFramework (INFO): Testing reconstructing compact blocks from all peers...
2024-05-28T16:20:12.605000Z TestFramework (ERROR): Assertion failed
Traceback (most recent call last):
  File "/work/test/functional/test_framework/test_framework.py", line 147, in main
    self._run_test_internal()
  File "/work/test/functional/test_framework/test_framework.py", line 137, in _run_test_internal
    self.run_test()
  File "/work/test/functional/p2p_compactblocks.py", line 926, in run_test
    self.test_compactblock_reconstruction_multiple_peers(
  File "/work/test/functional/p2p_compactblocks.py", line 826, in test_compactblock_reconstruction_multiple_peers
    assert tx.hash in mempool
AssertionError
2024-05-28T16:20:12.658000Z TestFramework (INFO): Stopping nodes
2024-05-28T16:20:13.013000Z TestFramework (WARNING): Not cleaning up dir /work/abc-ci-builds/build-diff/test/tmp/test_runner_₿₵_  _20240528_161541/p2p_compactblocks_83
2024-05-28T16:20:13.013000Z TestFramework (ERROR): Test failed. Test logging available at /work/abc-ci-builds/build-diff/test/tmp/test_runner_₿₵_  _20240528_161541/p2p_compactblocks_83/test_framework.log
2024-05-28T16:20:13.014000Z TestFramework (ERROR): 
2024-05-28T16:20:13.014000Z TestFramework (ERROR): Hint: Call /work/test/functional/combine_logs.py '/work/abc-ci-builds/build-diff/test/tmp/test_runner_₿₵_  _20240528_161541/p2p_compactblocks_83' to consolidate all logs
2024-05-28T16:20:13.014000Z TestFramework (ERROR): 
2024-05-28T16:20:13.015000Z TestFramework (ERROR): If this failure happened unexpectedly or intermittently, please file a bug and provide a link or upload of the combined log.
2024-05-28T16:20:13.015000Z TestFramework (ERROR): https://github.com/Bitcoin-ABC/bitcoin-abc/issues
2024-05-28T16:20:13.015000Z TestFramework (ERROR):

Each failure log is accessible here:
Bitcoin ABC functional tests: p2p_compactblocks.py
Bitcoin ABC functional tests with the next upgrade activated: p2p_compactblocks.py

PiRK mentioned this in D16235: scripted-diff: rename and de-globalise g_cs_orphans.May 28 2024, 18:07
Fabien updated this revision to Diff 48005.May 29 2024, 07:56

Rebase

Harbormaster completed remote builds in B29153: Diff 48005.May 29 2024, 09:26
Closed by commit rABC594e0d9ee5b6: txorphanage: make m_peer_work_set private (authored by Anthony Towns <aj@erisian.com.au>, committed by Fabien). · Explain WhyMay 29 2024, 09:29
This revision was automatically updated to reflect the committed changes.
Fabien added a commit: rABC594e0d9ee5b6: txorphanage: make m_peer_work_set private.

Revision Contents
Changeset List

PathSize
src/
23 lines
25 lines
23 lines

Diff 48014

View Options

src/net_processing.cpp

Loading...
View Options

src/txorphanage.h

Loading...
View Options

src/txorphanage.cpp

Loading...