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

MCOL-520

Browse Source
This commit is contained in:
David Hill
2018-09-27 08:59:03 -05:00
parent 92cb061455
commit 4d1729c967
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
procmon/processmonitor.cpp
View File

@ -1830,7 +1830,7 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
if ( !rootUser) if ( !rootUser)
{ {
cmd = "chown -R " + USER + ":" + USER + " " + startup::StartUp::installDir() + "/data" + dbrootID + " > /dev/null"; cmd = "chown -R " + USER + ":" + USER + " " + startup::StartUp::installDir() + "/data" + dbrootID + " > /dev/null 2>&1";
system(cmd.c_str()); system(cmd.c_str());
} }
@ -2670,16 +2670,16 @@ pid_t ProcessMonitor::startProcess(string processModuleType, string processName,
if ( LogFile == "off" ) if ( LogFile == "off" )
{ {
string cmd = "mv " + outFileName + " " + saveoutFileName + " > /dev/null"; string cmd = "mv " + outFileName + " " + saveoutFileName + " > /dev/null 2>&1";
system(cmd.c_str()); system(cmd.c_str());
cmd = "mv " + errFileName + " " + saveerrFileName + " > /dev/null"; cmd = "mv " + errFileName + " " + saveerrFileName + " > /dev/null 2>&1";
system(cmd.c_str()); system(cmd.c_str());
} }
else else
{ {
string cmd = "mv " + outFileName + " " + saveoutFileName + " > /dev/null"; string cmd = "mv " + outFileName + " " + saveoutFileName + " > /dev/null 2>&1";
system(cmd.c_str()); system(cmd.c_str());
cmd = "mv " + errFileName + " " + saveerrFileName + " > /dev/null"; cmd = "mv " + errFileName + " " + saveerrFileName + " > /dev/null 2>&1";
system(cmd.c_str()); system(cmd.c_str());
} }
@ -3109,7 +3109,7 @@ int ProcessMonitor::updateLog(std::string action, std::string level)
//if non-root, change file permissions so we can update it //if non-root, change file permissions so we can update it
if ( !rootUser) if ( !rootUser)
{ {
string cmd = "chmod 666 " + fileName + " > /dev/null"; string cmd = "chmod 666 " + fileName + " > /dev/null 2>&1";
system(cmd.c_str()); system(cmd.c_str());
} }
@ -4866,7 +4866,7 @@ std::string ProcessMonitor::sendMsgProcMon1( std::string module, ByteStream msg,
string IPAddr = sysConfig->getConfig(msgPort, "IPAddr"); string IPAddr = sysConfig->getConfig(msgPort, "IPAddr");
string cmdLine = "ping "; string cmdLine = "ping ";
string cmdOption = " -c 1 -w 5 >> /dev/null"; string cmdOption = " -c 1 -w 5 >> /dev/null 2>&1";
string cmd = cmdLine + IPAddr + cmdOption; string cmd = cmdLine + IPAddr + cmdOption;
if ( system(cmd.c_str()) != 0 ) if ( system(cmd.c_str()) != 0 )
@ -5950,7 +5950,7 @@ bool ProcessMonitor::amazonVolumeCheck(int dbrootID)
if (oam.attachEC2Volume(volumeName, deviceName, instanceName)) if (oam.attachEC2Volume(volumeName, deviceName, instanceName))
{ {
string cmd = "mount " + deviceName + " " + startup::StartUp::installDir() + "/mysql/db -t ext2 -o defaults > /dev/null"; string cmd = "mount " + deviceName + " " + startup::StartUp::installDir() + "/mysql/db -t ext2 -o defaults > /dev/null 2>&1";
system(cmd.c_str()); system(cmd.c_str());
log.writeLog(__LINE__, "mount cmd: " + cmd, LOG_TYPE_DEBUG); log.writeLog(__LINE__, "mount cmd: " + cmd, LOG_TYPE_DEBUG);
@ -6021,7 +6021,7 @@ bool ProcessMonitor::amazonVolumeCheck(int dbrootID)
if (oam.attachEC2Volume(volumeName, deviceName, instanceName)) if (oam.attachEC2Volume(volumeName, deviceName, instanceName))
{ {
string cmd = "mount " + startup::StartUp::installDir() + "/data" + oam.itoa(dbrootID) + " > /dev/null"; string cmd = "mount " + startup::StartUp::installDir() + "/data" + oam.itoa(dbrootID) + " > /dev/null 2>&1";
system(cmd.c_str()); system(cmd.c_str());
return true; return true;
} }
@ -6326,7 +6326,7 @@ int ProcessMonitor::checkDataMount()
if ( !rootUser) if ( !rootUser)
{ {
cmd = "chown -R " + USER + ":" + USER + " " + dbroot + " > /dev/null"; cmd = "chown -R " + USER + ":" + USER + " " + dbroot + " > /dev/null 2>&1";
system(cmd.c_str()); system(cmd.c_str());
} }