database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Added _exit in Child dmlproc service

Browse Source
This commit is contained in:
Leonid Fedorov
2021-05-28 10:09:35 +00:00
parent 90397dfed0
commit d08eff75ba
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dmlproc/dmlproc.cpp
View File

@ -684,10 +684,8 @@ int ServiceDMLProc::Child()
setupChildSignalHandlers(); setupChildSignalHandlers();
dmlserver.start(); _exit(dmlserver.start());
// WIP the rc looks misguiding b/c DMLProc now can legitimately quits from DMLServer::start()
// so Child() should return dmlserver.start().
return 1; return 1;
} }

5
dmlproc/dmlprocessor.cpp
View File

@ -1213,7 +1213,7 @@ DMLServer::DMLServer(int packageMaxThreads, int packageWorkQueueSize, DBRM* dbrm
fDmlPackagepool.setName("DmlPackagepool"); fDmlPackagepool.setName("DmlPackagepool");
} }
void DMLServer::start() int DMLServer::start()
{ {
messageqcpp::IOSocket ios; messageqcpp::IOSocket ios;
uint32_t nextID = 1; uint32_t nextID = 1;
@ -1246,6 +1246,7 @@ void DMLServer::start()
} }
cancelThread.join(); cancelThread.join();
return EXIT_SUCCESS;
} }
catch (std::exception& ex) catch (std::exception& ex)
{ {
@ -1258,6 +1259,7 @@ void DMLServer::start()
message.format(args); message.format(args);
logging::Logger logger(lid.fSubsysID); logging::Logger logger(lid.fSubsysID);
logger.logMessage(logging::LOG_TYPE_CRITICAL, message, lid); logger.logMessage(logging::LOG_TYPE_CRITICAL, message, lid);
return EXIT_FAILURE;
} }
catch (...) catch (...)
{ {
@ -1269,6 +1271,7 @@ void DMLServer::start()
message.format(args); message.format(args);
logging::Logger logger(lid.fSubsysID); logging::Logger logger(lid.fSubsysID);
logger.logMessage(logging::LOG_TYPE_CRITICAL, message, lid); logger.logMessage(logging::LOG_TYPE_CRITICAL, message, lid);
return EXIT_FAILURE;
} }
} }

2
dmlproc/dmlprocessor.h
View File

@ -112,7 +112,7 @@ public:
~DMLServer() { } ~DMLServer() { }
void start(); //Does not return int start();
/** @brief get the dml package thread pool size /** @brief get the dml package thread pool size
*/ */