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

MCOL-787 - add checks before dbbuilder 7

Browse Source
This commit is contained in:
david hill
2017-07-19 09:49:31 -05:00
parent 3501c1a17a
commit 6a0bceaa9b
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
procmgr/processmanager.cpp
View File

@@ -6855,7 +6855,14 @@ void startSystemThread(oam::DeviceNetworkList Devicenetworklist)
} }
//run command to build system table if they don't already exist //run command to build system table if they don't already exist
processManager.buildSystemTables("pm1"); sleep(5);
int ret = processManager.buildSystemTables("pm1");
if (ret == oam::API_SUCCESS )
log.writeLog(__LINE__, "System Catalog Successfully Built by ProcMgr", LOG_TYPE_DEBUG);
else
log.writeLog(__LINE__, "System Catalog Successfully not built by ProcMgr, ret code = " + oam.itoa(ret), LOG_TYPE_DEBUG);
log.writeLog(__LINE__, "startSystemThread Exit", LOG_TYPE_DEBUG);
// exit thread // exit thread
log.writeLog(__LINE__, "startSystemThread Exit", LOG_TYPE_DEBUG); log.writeLog(__LINE__, "startSystemThread Exit", LOG_TYPE_DEBUG);

13
procmon/processmonitor.cpp
View File

@@ -3480,6 +3480,17 @@ int ProcessMonitor::buildSystemTables()
oam.getSystemConfig("DBRoot1", DBdir); oam.getSystemConfig("DBRoot1", DBdir);
string fileName = DBdir + "/000.dir"; string fileName = DBdir + "/000.dir";
//check if postConfigure or dbbuilder is running, return if so
string cmd = "ps aux | grep postConfigure | grep -v grep";
int rtnCode = system(cmd.c_str());
if (WEXITSTATUS(rtnCode) == 0)
return API_ALREADY_IN_PROGRESS;
cmd = "ps aux | grep dbbuilder | grep -v grep";
rtnCode = system(cmd.c_str());
if (WEXITSTATUS(rtnCode) == 0)
return API_ALREADY_IN_PROGRESS;
if (!IDBPolicy::exists(fileName.c_str())) { if (!IDBPolicy::exists(fileName.c_str())) {
string logdir("/var/log/mariadb/columnstore"); string logdir("/var/log/mariadb/columnstore");
@@ -3490,7 +3501,7 @@ int ProcessMonitor::buildSystemTables()
log.writeLog(__LINE__, "buildSystemTables: dbbuilder 7 Successfully Launched" , LOG_TYPE_DEBUG); log.writeLog(__LINE__, "buildSystemTables: dbbuilder 7 Successfully Launched" , LOG_TYPE_DEBUG);
return API_SUCCESS; return API_SUCCESS;
} }
log.writeLog(__LINE__, "buildSystemTables: System Tables Already Exist", LOG_TYPE_ERROR ); log.writeLog(__LINE__, "buildSystemTables: System Tables Already Exist", LOG_TYPE_DEBUG );
return API_FILE_ALREADY_EXIST; return API_FILE_ALREADY_EXIST;
} }