merge bitcoin#24117: make indices robust against init aborts

continuation of 123cf8d2 (dash#5501)
This commit is contained in:
Kittywhiskers Van Gogh 2024-10-05 09:18:58 +00:00
parent 6645cde0e7
commit 51bc29ee59
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD

View File

@ -64,6 +64,8 @@ class InitStressTest(BitcoinTestFramework):
'addcon thread start', 'addcon thread start',
'loadblk thread start', 'loadblk thread start',
'txindex thread start', 'txindex thread start',
'block filter index thread start',
'coinstatsindex thread start',
'msghand thread start', 'msghand thread start',
'net thread start', 'net thread start',
'addcon thread start', 'addcon thread start',
@ -74,7 +76,7 @@ class InitStressTest(BitcoinTestFramework):
for terminate_line in lines_to_terminate_after: for terminate_line in lines_to_terminate_after:
self.log.info(f"Starting node and will exit after line '{terminate_line}'") self.log.info(f"Starting node and will exit after line '{terminate_line}'")
with node.wait_for_debug_log([terminate_line], ignore_case=True): with node.wait_for_debug_log([terminate_line], ignore_case=True):
node.start(extra_args=['-txindex=1']) node.start(extra_args=['-txindex=1', '-blockfilterindex=1', '-coinstatsindex=1'])
self.log.debug("Terminating node after terminate line was found") self.log.debug("Terminating node after terminate line was found")
sigterm_node() sigterm_node()
@ -109,7 +111,7 @@ class InitStressTest(BitcoinTestFramework):
# investigate doing this later. # investigate doing this later.
node.assert_start_raises_init_error( node.assert_start_raises_init_error(
extra_args=['-txindex=1'], extra_args=['-txindex=1', '-blockfilterindex=1', '-coinstatsindex=1'],
expected_msg=err_fragment, expected_msg=err_fragment,
match=ErrorMatch.PARTIAL_REGEX, match=ErrorMatch.PARTIAL_REGEX,
) )