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

Fixed a bug where procmon would have a PID of 0 for StorageManager,

Browse Source 
and would end up sending SIGTERM to everything.
This commit is contained in:
Patrick LeBlanc
2019-07-15 15:15:38 -05:00
parent 3f532eb059
commit 4ec3cdc8b9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
procmon/processmonitor.cpp
View File

@ -2227,13 +2227,16 @@ int ProcessMonitor::stopProcess(pid_t processID, std::string processName, std::s
// exit gracefully. This will wait until StorageManager goes down to prevent // exit gracefully. This will wait until StorageManager goes down to prevent
// weirdness that I suspect will happen if we combine a slow connection with a restart // weirdness that I suspect will happen if we combine a slow connection with a restart
// command. // command.
if (processName == "StorageManager") if (processName == "StorageManager" && processID != 0)
{ {
while (status == API_SUCCESS) while (status == API_SUCCESS)
{ {
sleep(1); sleep(1);
log.writeLog(__LINE__, "Waiting for StorageManager to go away...", LOG_TYPE_DEBUG); ostringstream os;
os << "Waiting for StorageManager to exit gracefully... pid is " << processID;
log.writeLog(__LINE__, os.str(), LOG_TYPE_DEBUG);
status = kill(processID, SIGTERM); status = kill(processID, SIGTERM);
break;
} }
return API_SUCCESS; return API_SUCCESS;