ARCHIVE/hpcore
1
0
Fork 0
mirror of https://github.com/EvernodeXRPL/hpcore.git synced 2026-04-29 15:37:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Supported not storing raw data shards. (#289)

Browse Source
This commit is contained in:
Ravin Perera
2021-04-13 11:11:37 +05:30
committed by GitHub
parent 77279dc6ac
commit 7a837ede7c
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/conf.cpp
View File

@@ -154,7 +154,7 @@ namespace conf
cfg.node.role = ROLE::VALIDATOR;
cfg.node.history = HISTORY::CUSTOM;
cfg.node.history_config.max_primary_shards = 1;
cfg.node.history_config.max_raw_shards = 1;
cfg.node.history_config.max_raw_shards = 0;
cfg.contract.id = crypto::generate_uuid();
cfg.contract.execute = true;
@@ -367,12 +367,6 @@ namespace conf
std::cerr << "'max_primary_shards' cannot be zero in history=custom mode.\n";
return -1;
}
if (cfg.node.history_config.max_raw_shards == 0)
{
std::cerr << "'max_raw_shards' cannot be zero in history=custom mode.\n";
return -1;
}
}
}
catch (const std::exception &e)

2
src/conf.hpp
View File

@@ -51,7 +51,7 @@ namespace conf
struct history_configuration
{
uint64_t max_primary_shards; // Maximum number of shards for primary shards.
uint64_t max_raw_shards; // Maximum number of shards for raw shards.
uint64_t max_raw_shards; // Maximum number of shards for raw data shards.
};
// Log severity levels used in Hot Pocket.

4
src/consensus.cpp
View File

@@ -299,7 +299,7 @@ namespace consensus
ledger::ledger_sync_worker.set_target_push_back(hpfs::sync_target{sync_name, majority_raw_shard_id.hash, shard_path, hpfs::BACKLOG_ITEM_TYPE::DIR});
}
// If shards aren't aligned with max shard count, Do the relevant shard cleanups and requests.
// If shards aren't aligned with max shard count, do the relevant shard cleanups and requests.
// In the first consensus round sync completion after the startup.
if (!ledger::ledger_sync_worker.is_syncing && (!ledger::ctx.primary_shards_persisted || !ledger::ctx.raw_shards_persisted) && ledger::ledger_fs.acquire_rw_session() != -1)
{
@@ -989,7 +989,7 @@ namespace consensus
}
}
is_ledger_blob_desync = (ledger::ctx.get_last_raw_shard_id() != majority_raw_shard_id);
is_ledger_blob_desync = (conf::cfg.node.history_config.max_raw_shards > 0 && ledger::ctx.get_last_raw_shard_id() != majority_raw_shard_id);
}
/**

24
src/ledger/ledger.cpp
View File

@@ -81,6 +81,9 @@ namespace ledger
remove_old_shards(lcl_id.seq_no, PRIMARY_SHARD_SIZE, conf::cfg.node.history_config.max_primary_shards, PRIMARY_DIR);
remove_old_shards(lcl_id.seq_no, RAW_SHARD_SIZE, conf::cfg.node.history_config.max_raw_shards, RAW_DIR);
if (conf::cfg.node.history_config.max_raw_shards == 0)
ctx.raw_shards_persisted = true;
return 0;
}
@@ -422,6 +425,7 @@ namespace ledger
// Construct shard path.
shard_seq_no = (ledger_seq_no - 1) / shard_size;
const std::string shard_path = ledger_fs.physical_path(hpfs::RW_SESSION_NAME, std::string(shard_dir).append("/").append(std::to_string(shard_seq_no)));
const std::string db_path = shard_path + "/" + db_name;
// This means this is the first ledger of the shard.
// So create the shard folder and other required files.
@@ -435,23 +439,23 @@ namespace ledger
}
// Creating ledger database and open a database connection.
if (sqlite::open_db(shard_path + "/" + db_name, db) == -1)
if (sqlite::open_db(db_path, db) == -1)
{
LOG_ERROR << errno << ": Error creating the database " << db_name << " in " << shard_path;
LOG_ERROR << errno << ": Error creating the database " << db_name;
return -1;
}
if ((shard_dir == PRIMARY_DIR && sqlite::initialize_ledger_db(*db) == -1) ||
(shard_dir == RAW_DIR && sqlite::initialize_ledger_raw_db(*db) == -1))
{
LOG_ERROR << errno << ": Error initilizing the database " << db_name << " in " << shard_path;
LOG_ERROR << errno << ": Error initilizing the database " << db_name;
return -1;
}
// Create and update the hp table with current ledger version.
if (sqlite::create_hp_table(*db, version::LEDGER_VERSION) == -1)
{
LOG_ERROR << errno << ": Error creating hp table in " << db_name << " in " << shard_path;
LOG_ERROR << errno << ": Error creating hp table in " << db_name;
return -1;
}
@@ -507,9 +511,9 @@ namespace ledger
}
else
{
if (open_db && sqlite::open_db(shard_path + "/" + db_name, db) == -1)
if (open_db && sqlite::open_db(db_path, db) == -1)
{
LOG_ERROR << errno << ": Error openning the shard database in " << shard_path;
LOG_ERROR << errno << ": Error openning the shard database " << db_path;
return -1;
}
return 0;
@@ -540,7 +544,8 @@ namespace ledger
// There cannot be shards which is less than this shard no. since shards are continous.
if (!util::is_dir_exists(shard_path))
break;
else if (util::remove_directory_recursively(shard_path) == -1)
if (util::remove_directory_recursively(shard_path) == -1)
{
LOG_ERROR << errno << ": Error deleting shard: " << shard_path;
break;
@@ -561,10 +566,11 @@ namespace ledger
// Set persisted flag to true. So this cleanup won't get executed again.
shard_parent_dir == PRIMARY_DIR ? ctx.primary_shards_persisted = true : ctx.raw_shards_persisted = true;
const uint64_t max_shard_count = (shard_parent_dir == PRIMARY_DIR ? conf::cfg.node.history_config.max_primary_shards : conf::cfg.node.history_config.max_raw_shards);
const std::string shard_dir_path = std::string(ledger_fs.physical_path(hpfs::RW_SESSION_NAME, shard_parent_dir));
const uint64_t max_shard_count = shard_dir_path == PRIMARY_DIR ? conf::cfg.node.history_config.max_primary_shards : conf::cfg.node.history_config.max_raw_shards;
const std::string shard_dir_path = ledger_fs.physical_path(hpfs::RW_SESSION_NAME, shard_parent_dir);
const std::list<std::string> shard_list = util::fetch_dir_entries(shard_dir_path);
// Skip the sequence no file from the count.
uint64_t shard_count = shard_list.size() - 1;

2
src/ledger/sqlite.cpp
View File

@@ -57,8 +57,8 @@ namespace ledger::sqlite
const int flags = read_only ? SQLITE_OPEN_READONLY : (SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE);
if ((ret = sqlite3_open_v2(db_name.data(), db, flags, 0)) != SQLITE_OK)
{
LOG_ERROR << ret << ": Sqlite error when opening database " << db_name;
*db = NULL;
LOG_ERROR << "Can't open database: " << ret << ", " << sqlite3_errmsg(*db);
return -1;
}