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

more merges from 1.0.8

Browse Source
This commit is contained in:
david hill
2017-03-28 14:17:17 -05:00
parent 82cb9fd7fd
commit 04bdb60fff
6 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
oam/cloud/MCSInstanceCmds.sh
View File

@ -149,15 +149,15 @@ getPrivateIP() {
state=`aws ec2 describe-instances --instance-ids $instanceName --region $Region --output text --query 'Reservations[*].Instances[*].State.Name'` state=`aws ec2 describe-instances --instance-ids $instanceName --region $Region --output text --query 'Reservations[*].Instances[*].State.Name'`
if [ "$state" != "running" ]; then if [ "$state" != "running" ]; then
# not running # not running
if [ "$state" != "stopped" ]; then if [ "$state" == "stopped" ]; then
echo "stopped" echo "stopped"
exit 1 exit 1
else else
if [ "$state" != "terminated" ]; then if [ "$state" == "terminated" ]; then
echo "terminated" echo "terminated"
exit 1 exit 1
else else
if [ "$state" != "shutting-down" ]; then if [ "$state" == "shutting-down" ]; then
echo "terminated" echo "terminated"
exit 1 exit 1
else else

1
oam/oamcpp/liboamcpp.cpp
View File

@ -9677,7 +9677,6 @@ namespace oam
return true; return true;
} }
} }
writeLog("checkSystemRunning - system reported down", LOG_TYPE_DEBUG );
return false; return false;
} }

40
procmgr/processmanager.cpp
View File

@ -4477,15 +4477,18 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
} }
string calpontPackage; string calpontPackage;
string mysqlPackage;
string mysqldPackage;
string calpontPackage1;
string calpontPackage2;
string systemID; string systemID;
string packageType = "rpm"; string packageType = "rpm";
oam.getSystemConfig("EEPackageType", packageType); try
{
oam.getSystemConfig("EEPackageType", packageType);
}
catch (...)
{
log.writeLog(__LINE__, "addModule - ERROR: get EEPackageType", LOG_TYPE_ERROR);
}
// //
// check for RPM package // check for RPM package
@ -4513,23 +4516,13 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
homedir = p; homedir = p;
} }
if ( packageType != "binary") { if ( packageType == "rpm")
string separator = "-"; calpontPackage = homedir + "/mariadb-columnstore*" + systemsoftware.Version + "-" + systemsoftware.Release + "*.rpm.tar.gz";
if ( packageType == "deb" )
separator = "_";
//mariadb
calpontPackage = homedir + "/mariadb-columnstore*" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
mysqlPackage = homedir + "/mariadb-columnstore-storage-engine" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
mysqldPackage = homedir + "/mariadb-columnstore-mysql" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
calpontPackage1 = homedir + "/mariadb-columnstore-libs" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
calpontPackage2 = homedir + "/mariadb-columnstore-enterprise" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
}
else else
{ if ( packageType == "deb")
calpontPackage = homedir + "/mariadb-columnstore*" + systemsoftware.Version + "-" + systemsoftware.Release + "*.bin.tar.gz"; calpontPackage = homedir + "/mariadb-columnstore*" + systemsoftware.Version + "-" + systemsoftware.Release + "*.deb.tar.gz";
mysqlPackage = calpontPackage; else
mysqldPackage = calpontPackage; calpontPackage = homedir + "/mariadb-columnstore*" + systemsoftware.Version + "-" + systemsoftware.Release + "*.bin.tar.gz";
}
string cmd = "ls " + calpontPackage + " > /dev/null 2>&1"; string cmd = "ls " + calpontPackage + " > /dev/null 2>&1";
int rtnCode = system(cmd.c_str()); int rtnCode = system(cmd.c_str());
@ -5368,6 +5361,7 @@ int ProcessManager::removeModule(oam::DeviceNetworkList devicenetworklist, bool
} }
//validate the module list to be removed //validate the module list to be removed
listPT = devicenetworklist.begin();
for( ; listPT != devicenetworklist.end() ; listPT++) for( ; listPT != devicenetworklist.end() ; listPT++)
{ {
int returnStatus = oam.validateModule((*listPT).DeviceName); int returnStatus = oam.validateModule((*listPT).DeviceName);
@ -5381,6 +5375,7 @@ int ProcessManager::removeModule(oam::DeviceNetworkList devicenetworklist, bool
if(manualFlag) if(manualFlag)
{ {
//stopModules being removed with the REMOVE option, which will stop process //stopModules being removed with the REMOVE option, which will stop process
listPT = devicenetworklist.begin();
for( ; listPT != devicenetworklist.end() ; listPT++) for( ; listPT != devicenetworklist.end() ; listPT++)
{ {
string moduleName = (*listPT).DeviceName; string moduleName = (*listPT).DeviceName;
@ -5683,9 +5678,6 @@ int ProcessManager::removeModule(oam::DeviceNetworkList devicenetworklist, bool
rpw = "root"; rpw = "root";
} }
log.writeLog(__LINE__, "Setup MySQL Replication for new Modules being Added", LOG_TYPE_DEBUG);
processManager.setMySQLReplication(devicenetworklist, oam::UnassignedName, false, true, password );
return API_SUCCESS; return API_SUCCESS;
} }

8
procmon/main.cpp
View File

@ -119,11 +119,11 @@ int main(int argc, char **argv)
USER = p; USER = p;
// change permissions on /dev/shm // change permissions on /dev/shm
string cmd = "chmod 777 /dev/shm >/dev/null 2>&1";
if ( !rootUser) if ( !rootUser)
cmd = "sudo chmod 777 /dev/shm >/dev/null 2>&1"; {
string cmd = "sudo chmod 777 /dev/shm >/dev/null 2>&1";
system(cmd.c_str()); system(cmd.c_str());
}
// get and set locale language // get and set locale language
string systemLang = "C"; string systemLang = "C";

2
utils/loggingcpp/SubsystemIDs.txt
View File

@ -15,7 +15,7 @@
08 - oamcpp 08 - oamcpp
09 - servermonitor 09 - servermonitor
10 - traphandler 10 - traphandler
11 - snmpmanager 11 - alarmmanager
12 - configcpp 12 - configcpp
13 - loggingcpp 13 - loggingcpp
14 - messageqcpp 14 - messageqcpp

2
utils/loggingcpp/messagelog.cpp
View File

@ -57,7 +57,7 @@ const vector<string> SubsystemID = ba::list_of
("oamcpp") // id = 8 ("oamcpp") // id = 8
("ServerMonitor") // id = 9 ("ServerMonitor") // id = 9
("traphandler") // id = 10 ("traphandler") // id = 10
("snmpmanager") // id = 11 ("alarmmanager") // id = 11
("configcpp") // id = 12 ("configcpp") // id = 12
("loggingcpp") // id = 13 ("loggingcpp") // id = 13
("messageqcpp") // id = 14 ("messageqcpp") // id = 14