highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-30 02:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

init: don't delete PID file if it was not generated

Browse Source 
Previously, starting a second bitcoind using the same datadir would
correctly fail to init and shutdown. However during shutdown the PID
file belonging to the first instance would be erroneously removed by
the second process shutting down.

Fix this to only delete the PID file if we created it.
This commit is contained in:
willcl-ark
2023-11-27 10:29:02 +00:00
parent 160d23677a
commit 8f6ab31863
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/functional/feature_filelock.py
View File

@ -30,8 +30,11 @@ class FilelockTest(BitcoinTestFramework):
expected_msg = f"Error: Cannot obtain a lock on data directory {datadir}. {self.config['environment']['PACKAGE_NAME']} is probably already running."
self.nodes[1].assert_start_raises_init_error(extra_args=[f'-datadir={self.nodes[0].datadir_path}', '-noserver'], expected_msg=expected_msg)
self.log.info("Check that cookie and PID file are not deleted when attempting to start a second bitcoind using the same datadir")
cookie_file = datadir / ".cookie"
assert cookie_file.exists() # should not be deleted during the second bitcoind instance shutdown
pid_file = datadir / "bitcoind.pid"
assert pid_file.exists()
if self.is_wallet_compiled():
def check_wallet_filelock(descriptors):