From 04bdb60fff3c1c4b6091f8c104e3ea572c67e9be Mon Sep 17 00:00:00 2001 From: david hill Date: Tue, 28 Mar 2017 14:17:17 -0500 Subject: [PATCH] more merges from 1.0.8 --- oam/cloud/MCSInstanceCmds.sh | 6 ++--- oam/oamcpp/liboamcpp.cpp | 1 - procmgr/processmanager.cpp | 40 +++++++++++++------------------ procmon/main.cpp | 8 +++---- utils/loggingcpp/SubsystemIDs.txt | 2 +- utils/loggingcpp/messagelog.cpp | 2 +- 6 files changed, 25 insertions(+), 34 deletions(-) diff --git a/oam/cloud/MCSInstanceCmds.sh b/oam/cloud/MCSInstanceCmds.sh index 8cea9c559..fbd0b6f31 100755 --- a/oam/cloud/MCSInstanceCmds.sh +++ b/oam/cloud/MCSInstanceCmds.sh @@ -149,15 +149,15 @@ getPrivateIP() { state=`aws ec2 describe-instances --instance-ids $instanceName --region $Region --output text --query 'Reservations[*].Instances[*].State.Name'` if [ "$state" != "running" ]; then # not running - if [ "$state" != "stopped" ]; then + if [ "$state" == "stopped" ]; then echo "stopped" exit 1 else - if [ "$state" != "terminated" ]; then + if [ "$state" == "terminated" ]; then echo "terminated" exit 1 else - if [ "$state" != "shutting-down" ]; then + if [ "$state" == "shutting-down" ]; then echo "terminated" exit 1 else diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp index 810aac264..02c985b6a 100644 --- a/oam/oamcpp/liboamcpp.cpp +++ b/oam/oamcpp/liboamcpp.cpp @@ -9677,7 +9677,6 @@ namespace oam return true; } } - writeLog("checkSystemRunning - system reported down", LOG_TYPE_DEBUG ); return false; } diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp index 8dedf915d..c0d53c989 100644 --- a/procmgr/processmanager.cpp +++ b/procmgr/processmanager.cpp @@ -4477,15 +4477,18 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str } string calpontPackage; - string mysqlPackage; - string mysqldPackage; - string calpontPackage1; - string calpontPackage2; string systemID; 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 @@ -4513,23 +4516,13 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str homedir = p; } - if ( packageType != "binary") { - string separator = "-"; - 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; - } + if ( packageType == "rpm") + calpontPackage = homedir + "/mariadb-columnstore*" + systemsoftware.Version + "-" + systemsoftware.Release + "*.rpm.tar.gz"; else - { - calpontPackage = homedir + "/mariadb-columnstore*" + systemsoftware.Version + "-" + systemsoftware.Release + "*.bin.tar.gz"; - mysqlPackage = calpontPackage; - mysqldPackage = calpontPackage; - } + if ( packageType == "deb") + calpontPackage = homedir + "/mariadb-columnstore*" + systemsoftware.Version + "-" + systemsoftware.Release + "*.deb.tar.gz"; + else + calpontPackage = homedir + "/mariadb-columnstore*" + systemsoftware.Version + "-" + systemsoftware.Release + "*.bin.tar.gz"; string cmd = "ls " + calpontPackage + " > /dev/null 2>&1"; int rtnCode = system(cmd.c_str()); @@ -5368,6 +5361,7 @@ int ProcessManager::removeModule(oam::DeviceNetworkList devicenetworklist, bool } //validate the module list to be removed + listPT = devicenetworklist.begin(); for( ; listPT != devicenetworklist.end() ; listPT++) { int returnStatus = oam.validateModule((*listPT).DeviceName); @@ -5381,6 +5375,7 @@ int ProcessManager::removeModule(oam::DeviceNetworkList devicenetworklist, bool if(manualFlag) { //stopModules being removed with the REMOVE option, which will stop process + listPT = devicenetworklist.begin(); for( ; listPT != devicenetworklist.end() ; listPT++) { string moduleName = (*listPT).DeviceName; @@ -5683,9 +5678,6 @@ int ProcessManager::removeModule(oam::DeviceNetworkList devicenetworklist, bool 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; } diff --git a/procmon/main.cpp b/procmon/main.cpp index aa210ef85..9e71c8b29 100644 --- a/procmon/main.cpp +++ b/procmon/main.cpp @@ -119,11 +119,11 @@ int main(int argc, char **argv) USER = p; // change permissions on /dev/shm - string cmd = "chmod 777 /dev/shm >/dev/null 2>&1"; if ( !rootUser) - cmd = "sudo chmod 777 /dev/shm >/dev/null 2>&1"; - - system(cmd.c_str()); + { + string cmd = "sudo chmod 777 /dev/shm >/dev/null 2>&1"; + system(cmd.c_str()); + } // get and set locale language string systemLang = "C"; diff --git a/utils/loggingcpp/SubsystemIDs.txt b/utils/loggingcpp/SubsystemIDs.txt index 409aee8ca..83e99097c 100644 --- a/utils/loggingcpp/SubsystemIDs.txt +++ b/utils/loggingcpp/SubsystemIDs.txt @@ -15,7 +15,7 @@ 08 - oamcpp 09 - servermonitor 10 - traphandler -11 - snmpmanager +11 - alarmmanager 12 - configcpp 13 - loggingcpp 14 - messageqcpp diff --git a/utils/loggingcpp/messagelog.cpp b/utils/loggingcpp/messagelog.cpp index d3185f6c3..0df5e6bdd 100644 --- a/utils/loggingcpp/messagelog.cpp +++ b/utils/loggingcpp/messagelog.cpp @@ -57,7 +57,7 @@ const vector SubsystemID = ba::list_of ("oamcpp") // id = 8 ("ServerMonitor") // id = 9 ("traphandler") // id = 10 - ("snmpmanager") // id = 11 + ("alarmmanager") // id = 11 ("configcpp") // id = 12 ("loggingcpp") // id = 13 ("messageqcpp") // id = 14