Page MenuHomePhabricator
Files F13115502

D6334.diff
No OneTemporary
Actions

D6334.diff
View Options

diff --git a/src/fs.cpp b/src/fs.cpp
--- a/src/fs.cpp
+++ b/src/fs.cpp
@@ -11,6 +11,7 @@
#include <sys/file.h>
#include <sys/utsname.h>
#else
+#define NOMINMAX
#include <codecvt>
#include <windows.h>
#endif
@@ -110,7 +111,8 @@
}
_OVERLAPPED overlapped = {0};
if (!LockFileEx(hFile, LOCKFILE_EXCLUSIVE_LOCK | LOCKFILE_FAIL_IMMEDIATELY,
- 0, 0, 0, &overlapped)) {
+ 0, std::numeric_limits<DWORD>::max(),
+ std::numeric_limits<DWORD>::max(), &overlapped)) {
reason = GetErrorReason();
return false;
}
diff --git a/test/functional/feature_filelock.py b/test/functional/feature_filelock.py
new file mode 100755
--- /dev/null
+++ b/test/functional/feature_filelock.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+# Copyright (c) 2018 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""Check that it's not possible to start a second bitcoind instance using the same datadir or wallet."""
+import os
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_node import ErrorMatch
+
+
+class FilelockTest(BitcoinTestFramework):
+ def set_test_params(self):
+ self.setup_clean_chain = True
+ self.num_nodes = 2
+
+ def setup_network(self):
+ self.add_nodes(self.num_nodes, extra_args=None)
+ self.nodes[0].start([])
+ self.nodes[0].wait_for_rpc_connection()
+
+ def run_test(self):
+ datadir = os.path.join(self.nodes[0].datadir, 'regtest')
+ self.log.info("Using datadir {}".format(datadir))
+
+ self.log.info(
+ "Check that we can't start a second bitcoind instance using the same datadir")
+ expected_msg = "Error: Cannot obtain a lock on data directory {}. Bitcoin ABC is probably already running.".format(
+ datadir)
+ self.nodes[1].assert_start_raises_init_error(extra_args=[
+ '-datadir={}'.format(self.nodes[0].datadir), '-noserver'], expected_msg=expected_msg)
+
+ if self.is_wallet_compiled():
+ wallet_dir = os.path.join(datadir, 'wallets')
+ self.log.info(
+ "Check that we can't start a second bitcoind instance using the same wallet")
+ expected_msg = "Error: Error initializing wallet database environment"
+ self.nodes[1].assert_start_raises_init_error(
+ extra_args=[
+ '-walletdir={}'.format(wallet_dir),
+ '-noserver'],
+ expected_msg=expected_msg,
+ match=ErrorMatch.PARTIAL_REGEX)
+
+
+if __name__ == '__main__':
+ FilelockTest().main()

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 1, 11:15 (14 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5187548
Default Alt Text
D6334.diff (2 KB)

Event Timeline