Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-27 15:29:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #635

Browse Source 
8b3539b core: prevent the database from being used by multiple daemons (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-01-31 15:22:14 +02:00
commit f780f2e7ba
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/cryptonote_core/cryptonote_core.cpp
View File

@ -218,6 +218,39 @@ namespace cryptonote
return m_blockchain_storage.get_alternative_blocks_count();
}
//-----------------------------------------------------------------------------------------------
bool core::lock_db_directory(const boost::filesystem::path &path)
{
// boost doesn't like locking directories...
const boost::filesystem::path lock_path = path / ".daemon_lock";
try
{
// ensure the file exists
std::ofstream(lock_path.string(), std::ios::out).close();
db_lock = boost::interprocess::file_lock(lock_path.string().c_str());
LOG_PRINT_L1("Locking " << lock_path.string());
if (!db_lock.try_lock())
{
LOG_PRINT_L0("Failed to lock " << lock_path.string());
return false;
}
return true;
}
catch (const std::exception &e)
{
LOG_PRINT_L0("Error trying to lock " << lock_path.string() << ": " << e.what());
return false;
}
}
//-----------------------------------------------------------------------------------------------
bool core::unlock_db_directory()
{
db_lock.unlock();
db_lock = boost::interprocess::file_lock();
return true;
}
//-----------------------------------------------------------------------------------------------
bool core::init(const boost::program_options::variables_map& vm)
{
bool r = handle_command_line(vm);
@ -280,6 +313,13 @@ namespace cryptonote
folder /= db->get_db_name();
LOG_PRINT_L0("Loading blockchain from folder " << folder.string() << " ...");
if (!lock_db_directory (folder))
{
LOG_ERROR ("Failed to lock " << folder);
delete db;
return false;
}
const std::string filename = folder.string();
// temporarily default to fastest:async:1000
blockchain_db_sync_mode sync_mode = db_async;
@ -398,6 +438,7 @@ namespace cryptonote
{
m_blockchain_storage.deinit();
}
unlock_db_directory();
return true;
}
//-----------------------------------------------------------------------------------------------

5
src/cryptonote_core/cryptonote_core.h
View File

@ -34,6 +34,7 @@
#include <boost/program_options/options_description.hpp>
#include <boost/program_options/variables_map.hpp>
#include <boost/interprocess/sync/file_lock.hpp>
#include "p2p/net_node_common.h"
#include "cryptonote_protocol/cryptonote_protocol_handler_common.h"
@ -172,6 +173,8 @@ namespace cryptonote
void graceful_exit();
bool check_fork_time();
bool relay_txpool_transactions();
bool lock_db_directory(const boost::filesystem::path &path);
bool unlock_db_directory();
static std::atomic<bool> m_fast_exit;
bool m_test_drop_download = true;
@ -205,6 +208,8 @@ namespace cryptonote
time_t m_last_json_checkpoints_update;
std::atomic_flag m_checkpoints_updating;
boost::interprocess::file_lock db_lock;
};
}