database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-09-02 12:41:17 +03:00
Code Activity

Merge branch 'develop' into MCOL-520

Browse Source
This commit is contained in:
david hill
2018-10-08 14:23:48 -05:00
committed by GitHub
parent f48b92e46f ca7cb9a7b1
commit 101b36acb6
63 changed files with 4305 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
procmon/processmonitor.cpp
View File

@@ -665,9 +665,6 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
else
log.writeLog(__LINE__, "START: process already active " + processName);
//Inform Process Manager that Process restart
//processRestarted(processName);
ackMsg << (ByteStream::byte) ACK;
ackMsg << (ByteStream::byte) START;
ackMsg << (ByteStream::byte) requestStatus;
@@ -772,9 +769,6 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
requestStatus = API_FAILURE;
}
//Inform Process Manager that Process restart
//processRestarted(processName);
ackMsg << (ByteStream::byte) ACK;
ackMsg << (ByteStream::byte) RESTART;
ackMsg << (ByteStream::byte) requestStatus;
@@ -4974,7 +4968,6 @@ void ProcessMonitor::checkModuleFailover( std::string processName)
{
// found a AVAILABLE mate, start it
log.writeLog(__LINE__, "Change UM Master to module " + systemprocessstatus.processstatus[i].Module, LOG_TYPE_DEBUG);
log.writeLog(__LINE__, "Disable local UM module " + config.moduleName(), LOG_TYPE_DEBUG);
log.writeLog(__LINE__, "Stop local UM module " + config.moduleName(), LOG_TYPE_DEBUG);
log.writeLog(__LINE__, "Disable Local will Enable UM module " + systemprocessstatus.processstatus[i].Module, LOG_TYPE_DEBUG);
@@ -5845,7 +5838,6 @@ bool ProcessMonitor::amazonIPCheck()
log.writeLog(__LINE__, "Assign Elastic IP Address failed : '" + moduleName + "' / '" + ELIPaddress, LOG_TYPE_ERROR);
break;
}
break;
}
@@ -6021,8 +6013,13 @@ bool ProcessMonitor::amazonVolumeCheck(int dbrootID)
if (oam.attachEC2Volume(volumeName, deviceName, instanceName))
{
string cmd = "mount " + startup::StartUp::installDir() + "/data" + oam.itoa(dbrootID) + " > /dev/null 2>&1";
log.writeLog(__LINE__, "amazonVolumeCheck function , volume to attached: " + volumeName, LOG_TYPE_DEBUG);
string cmd = "mount " + startup::StartUp::installDir() + "/data" + oam.itoa(dbrootID) + " > /dev/null";
system(cmd.c_str());
log.writeLog(__LINE__, "amazonVolumeCheck function , volume to mounted: " + volumeName, LOG_TYPE_DEBUG);
return true;
}
else