database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

A preparatory patch for MCOL-4170 Refactor services/systemd units to finish their bootstrap ...

Browse Source 
Moving the main service code in BRM/slavenode.cpp into a separate function.
This commit is contained in:
Alexander Barkov
2020-11-06 15:44:58 +04:00
parent f171867c57
commit e4d072f573
1 changed files with 66 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
versioning/BRM/slavenode.cpp
View File

@ -97,34 +97,13 @@ static void setupSignalHandlers()
}
int main(int argc, char** argv)
static int child(const string& nodeName)
{
// Set locale language
setlocale(LC_ALL, "");
setlocale(LC_NUMERIC, "C");
setupSignalHandlers();
BRM::logInit ( BRM::SubSystemLogId_workerNode );
string nodeName;
SlaveDBRMNode slave;
string arg;
int err = 0;
ShmKeys keys;
if (argc < 2)
{
ostringstream os;
os << "Usage: " << argv[0] << " DBRM_WorkerN";
cerr << os.str() << endl;
log(os.str());
fail();
exit(1);
}
idbdatafile::IDBPolicy::configIDBPolicy();
nodeName = argv[1];
try
{
comm = new SlaveComm(nodeName, &slave);
@ -139,14 +118,6 @@ int main(int argc, char** argv)
exit(1);
}
setupSignalHandlers();
if (!(argc >= 3 && (arg = argv[2]) == "fg"))
err = fork();
if (err == 0)
{
/* Start 4 threads to monitor write lock state */
monitorThreads.create_thread(RWLockMonitor
(&die, slave.getEMFLLockStatus(), keys.KEYRANGE_EMFREELIST_BASE));
@ -182,8 +153,41 @@ int main(int argc, char** argv)
os << "An error occurred: " << e.what();
cerr << os.str() << endl;
log(os.str());
return 1;
}
return 0;
}
int main(int argc, char** argv)
{
// Set locale language
setlocale(LC_ALL, "");
setlocale(LC_NUMERIC, "C");
BRM::logInit ( BRM::SubSystemLogId_workerNode );
string arg;
int err = 0;
if (argc < 2)
{
ostringstream os;
os << "Usage: " << argv[0] << " DBRM_WorkerN";
cerr << os.str() << endl;
log(os.str());
fail();
exit(1);
}
idbdatafile::IDBPolicy::configIDBPolicy();
if (!(argc >= 3 && (arg = argv[2]) == "fg"))
err = fork();
if (err == 0)
{
return child(argv[1]);
}
else if (err < 0)
{