Skip to content

Commit 5f4422d

Browse files
committed
Merge bitcoin#32010: qa: Fix TxIndex race conditions
3301d2c qa: Wait for txindex to avoid race condition (Hodlinator) 9bfb0d7 qa: Remove unnecessary -txindex args (Hodlinator) 7ac281c qa: Add missing coverage of corrupt indexes (Hodlinator) Pull request description: - Add synchronization in 3 places where if the Transaction Index happens to be slow, we get rare test failures when querying it for transactions (one such case experienced on Windows, prompting investigation). - Remove unnecessary TxIndex initialization in some tests. - Add some test coverage where TxIndex aspect could be tested in feature_init.py. ACKs for top commit: fjahr: re-ACK 3301d2c mzumsande: Code Review ACK 3301d2c furszy: Code review ACK 3301d2c Prabhat1308: Concept ACK [`3301d2c`](bitcoin@3301d2c) Tree-SHA512: 7c2019e38455f344856aaf6b381faafbd88d53dc88d13309deb718c1dcfbee4ccca7c7f1b66917395503a6f94c3b216a007ad432cc8b93d0309db9805f38d602
2 parents cd8089c + 3301d2c commit 5f4422d

6 files changed

+31
-9
lines changed

test/functional/feature_init.py

+17-7
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def check_clean_start():
8888

8989
args = ['-txindex=1', '-blockfilterindex=1', '-coinstatsindex=1']
9090
for terminate_line in lines_to_terminate_after:
91-
self.log.info(f"Starting node and will exit after line {terminate_line}")
91+
self.log.info(f"Starting node and will terminate after line {terminate_line}")
9292
with node.busy_wait_for_debug_log([terminate_line]):
9393
if platform.system() == 'Windows':
9494
# CREATE_NEW_PROCESS_GROUP is required in order to be able
@@ -108,12 +108,22 @@ def check_clean_start():
108108
'blocks/index/*.ldb': 'Error opening block database.',
109109
'chainstate/*.ldb': 'Error opening coins database.',
110110
'blocks/blk*.dat': 'Error loading block database.',
111+
'indexes/txindex/MANIFEST*': 'LevelDB error: Corruption: CURRENT points to a non-existent file',
112+
# Removing these files does not result in a startup error:
113+
# 'indexes/blockfilter/basic/*.dat', 'indexes/blockfilter/basic/db/*.*', 'indexes/coinstats/db/*.*',
114+
# 'indexes/txindex/*.log', 'indexes/txindex/CURRENT', 'indexes/txindex/LOCK'
111115
}
112116

113117
files_to_perturb = {
114118
'blocks/index/*.ldb': 'Error loading block database.',
115119
'chainstate/*.ldb': 'Error opening coins database.',
116120
'blocks/blk*.dat': 'Corrupted block database detected.',
121+
'indexes/blockfilter/basic/db/*.*': 'LevelDB error: Corruption',
122+
'indexes/coinstats/db/*.*': 'LevelDB error: Corruption',
123+
'indexes/txindex/*.log': 'LevelDB error: Corruption',
124+
'indexes/txindex/CURRENT': 'LevelDB error: Corruption',
125+
# Perturbing these files does not result in a startup error:
126+
# 'indexes/blockfilter/basic/*.dat', 'indexes/txindex/MANIFEST*', 'indexes/txindex/LOCK'
117127
}
118128

119129
for file_patt, err_fragment in files_to_delete.items():
@@ -135,9 +145,10 @@ def check_clean_start():
135145
self.stop_node(0)
136146

137147
self.log.info("Test startup errors after perturbing certain essential files")
148+
dirs = ["blocks", "chainstate", "indexes"]
138149
for file_patt, err_fragment in files_to_perturb.items():
139-
shutil.copytree(node.chain_path / "blocks", node.chain_path / "blocks_bak")
140-
shutil.copytree(node.chain_path / "chainstate", node.chain_path / "chainstate_bak")
150+
for dir in dirs:
151+
shutil.copytree(node.chain_path / dir, node.chain_path / f"{dir}_bak")
141152
target_files = list(node.chain_path.glob(file_patt))
142153

143154
for target_file in target_files:
@@ -151,10 +162,9 @@ def check_clean_start():
151162

152163
start_expecting_error(err_fragment)
153164

154-
shutil.rmtree(node.chain_path / "blocks")
155-
shutil.rmtree(node.chain_path / "chainstate")
156-
shutil.move(node.chain_path / "blocks_bak", node.chain_path / "blocks")
157-
shutil.move(node.chain_path / "chainstate_bak", node.chain_path / "chainstate")
165+
for dir in dirs:
166+
shutil.rmtree(node.chain_path / dir)
167+
shutil.move(node.chain_path / f"{dir}_bak", node.chain_path / dir)
158168

159169
def init_pid_test(self):
160170
BITCOIN_PID_FILENAME_CUSTOM = "my_fancy_bitcoin_pid_file.foobar"

test/functional/mempool_accept.py

+2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
assert_equal,
4646
assert_greater_than,
4747
assert_raises_rpc_error,
48+
sync_txindex,
4849
)
4950
from test_framework.wallet import MiniWallet
5051
from test_framework.wallet_util import generate_keypair
@@ -270,6 +271,7 @@ def run_test(self):
270271

271272
self.log.info('A coinbase transaction')
272273
# Pick the input of the first tx we created, so it has to be a coinbase tx
274+
sync_txindex(self, node)
273275
raw_tx_coinbase_spent = node.getrawtransaction(txid=node.decoderawtransaction(hexstring=raw_tx_in_block)['vin'][0]['txid'])
274276
tx = tx_from_hex(raw_tx_coinbase_spent)
275277
self.check_mempool_result(

test/functional/rpc_rawtransaction.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
assert_equal,
3535
assert_greater_than,
3636
assert_raises_rpc_error,
37+
sync_txindex,
3738
)
3839
from test_framework.wallet import (
3940
getnewdestination,
@@ -70,7 +71,7 @@ def set_test_params(self):
7071
self.num_nodes = 3
7172
self.extra_args = [
7273
["-txindex"],
73-
["-txindex"],
74+
[],
7475
["-fastprune", "-prune=1"],
7576
]
7677
# whitelist peers to speed up tx relay / mempool sync
@@ -109,6 +110,7 @@ def getrawtransaction_tests(self):
109110
self.log.info(f"Test getrawtransaction {'with' if n == 0 else 'without'} -txindex")
110111

111112
if n == 0:
113+
sync_txindex(self, self.nodes[n])
112114
# With -txindex.
113115
# 1. valid parameters - only supply txid
114116
assert_equal(self.nodes[n].getrawtransaction(txId), tx['hex'])

test/functional/rpc_txoutproof.py

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from test_framework.util import (
1313
assert_equal,
1414
assert_raises_rpc_error,
15+
sync_txindex,
1516
)
1617
from test_framework.wallet import MiniWallet
1718

@@ -77,6 +78,7 @@ def run_test(self):
7778
assert_equal(sorted(self.nodes[0].verifytxoutproof(self.nodes[0].gettxoutproof([txid1, txid2]))), sorted(txlist))
7879
assert_equal(sorted(self.nodes[0].verifytxoutproof(self.nodes[0].gettxoutproof([txid2, txid1]))), sorted(txlist))
7980
# We can always get a proof if we have a -txindex
81+
sync_txindex(self, self.nodes[1])
8082
assert_equal(self.nodes[0].verifytxoutproof(self.nodes[1].gettxoutproof([txid_spent])), [txid_spent])
8183
# We can't get a proof if we specify transactions from different blocks
8284
assert_raises_rpc_error(-5, "Not all transactions found in specified or retrieved block", self.nodes[0].gettxoutproof, [txid1, txid3])

test/functional/test_framework/util.py

+7
Original file line numberDiff line numberDiff line change
@@ -592,3 +592,10 @@ def find_vout_for_address(node, txid, addr):
592592
if addr == tx["vout"][i]["scriptPubKey"]["address"]:
593593
return i
594594
raise RuntimeError("Vout not found for address: txid=%s, addr=%s" % (txid, addr))
595+
596+
597+
def sync_txindex(test_framework, node):
598+
test_framework.log.debug("Waiting for node txindex to sync")
599+
sync_start = int(time.time())
600+
test_framework.wait_until(lambda: node.getindexinfo("txindex")["txindex"]["synced"])
601+
test_framework.log.debug(f"Synced in {time.time() - sync_start} seconds")

test/functional/wallet_avoid_mixing_output_types.py

-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ def set_test_params(self):
117117
self.extra_args = [
118118
[
119119
"-addresstype=bech32",
120-
"-txindex",
121120
],
122121
[
123122
"-addresstype=p2sh-segwit",

0 commit comments

Comments
 (0)