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

Fix non-root gluster commands and undo change in processmonitor that was not meant to be checked in.

Browse Source
This commit is contained in:
Ben Thompson
2017-09-11 17:08:12 -05:00
parent 4c66199d67
commit e75afd3b8f
2 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
procmon/main.cpp
View File

@@ -162,8 +162,8 @@ int main(int argc, char **argv)
}
//re-read local system info with updated Columnstore.xml
sleep(1);
MonitorConfig config;
// sleep(1);
// MonitorConfig config;
//PMwithUM config
try {
@@ -357,9 +357,6 @@ int main(int argc, char **argv)
sleep(1);
}
}
//re-read local system info with new Columnstore.xml
sleep(1);
MonitorConfig config;
}
// not OAM parent module, delay starting until a successful get status is performed
@@ -412,9 +409,6 @@ int main(int argc, char **argv)
sleep(1);
}
}
//re-read local system info with new Columnstore.xml
sleep(1);
MonitorConfig config;
}
// not OAM parent module, delay starting until a successful get status is performed
@@ -481,11 +475,11 @@ int main(int argc, char **argv)
if ( retry == 20 )
{
log.writeLog(__LINE__, "Check DB mounts failed, infinidb shutting down", LOG_TYPE_CRITICAL);
log.writeLog(__LINE__, "Check DB mounts failed, shutting down", LOG_TYPE_CRITICAL);
//Set the alarm
aMonitor.sendAlarm(config.moduleName().c_str(), STARTUP_DIAGNOTICS_FAILURE, SET);
sleep (1);
string cmd = startup::StartUp::installDir() + "/bin/infinidb stop > /dev/null 2>&1";
string cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /dev/null 2>&1";
system(cmd.c_str());
}
@@ -635,8 +629,6 @@ int main(int argc, char **argv)
}
}
MonitorConfig config;
while(true)
{
try {