mirror/ternfs-XTXMarkets
1
0
Fork 0
mirror of https://github.com/XTXMarkets/ternfs.git synced 2025-12-30 15:30:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alert while initializing shard DB

Browse Source
This commit is contained in:
Francesco Mazzoli
2023-08-07 10:16:00 +00:00
parent 63ed6a90fa
commit 93b212c665
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpp/cdc/CDC.cpp
View File

@@ -917,9 +917,6 @@ void runCDC(const std::string& dbDir, const CDCOptions& options) {
LOG_INFO(env, " syslog = %s", (int)options.syslog);
}
CDCDB db(logger, xmon, dbDir);
auto shared = std::make_unique<CDCShared>(db);
// xmon first, so that by the time it shuts down it'll have all the leftover requests
if (xmon) {
XmonConfig config;
@@ -932,6 +929,9 @@ void runCDC(const std::string& dbDir, const CDCOptions& options) {
undertaker->checkin(std::move(xmonRunner), tid, "xmon");
}
CDCDB db(logger, xmon, dbDir);
auto shared = std::make_unique<CDCShared>(db);
{
auto server = std::make_unique<CDCServer>(logger, xmon, options, *shared);
pthread_t tid;

14
cpp/shard/Shard.cpp
View File

@@ -628,8 +628,9 @@ void runShard(ShardId shid, const std::string& dbDir, const ShardOptions& option
xmon = std::make_shared<XmonAgent>();
}
Env env(logger, xmon, "startup");
{
Env env(logger, xmon, "startup");
LOG_INFO(env, "Running shard %s with options:", shid);
LOG_INFO(env, " level = %s", options.logLevel);
LOG_INFO(env, " logFile = '%s'", options.logFile);
@@ -648,10 +649,6 @@ void runShard(ShardId shid, const std::string& dbDir, const ShardOptions& option
LOG_INFO(env, " syslog = %s", (int)options.syslog);
}
ShardDB db(logger, xmon, shid, dbDir);
ShardShared shared(db);
// xmon first, so that by the time it shuts down it'll have all the leftover requests
if (xmon) {
XmonConfig config;
@@ -668,6 +665,13 @@ void runShard(ShardId shid, const std::string& dbDir, const ShardOptions& option
undertaker->checkin(std::move(xmonRunner), tid, "xmon");
}
XmonNCAlert dbInitAlert;
env.updateAlert(dbInitAlert, "initializing database");
ShardDB db(logger, xmon, shid, dbDir);
env.clearAlert(dbInitAlert);
ShardShared shared(db);
{
auto server = std::make_unique<ShardServer>(logger, xmon, shid, options, 0, shared);
pthread_t tid;