From ca722bde9900f344acf351cbb6d0128a3a00970c Mon Sep 17 00:00:00 2001 From: david hill Date: Mon, 16 May 2016 16:01:58 -0500 Subject: [PATCH] changes --- oam/oamcpp/liboamcpp.cpp | 12 +++---- procmgr/processmanager.cpp | 18 +++++----- procmon/processmonitor.cpp | 70 +++++++++++++++++++------------------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp index f475ba27d..97e45f383 100644 --- a/oam/oamcpp/liboamcpp.cpp +++ b/oam/oamcpp/liboamcpp.cpp @@ -6220,7 +6220,7 @@ namespace oam } catch(...) { - cout << "ERROR: Problem setting DBRoot in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DBRoot in the MariaDB Columnstore System Configuration file" << endl; exceptionControl("setConfig", API_FAILURE); } } @@ -6234,9 +6234,9 @@ namespace oam exceptionControl("sysConfig->write", API_FAILURE); } - string cmd = startup::StartUp::installDir() + "/bin/infinidb status > /tmp/status.log"; + string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log"; system(cmd.c_str()); - if (!checkLogStatus("/tmp/status.log", "InfiniDB is running") ) + if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) return; //get updated Calpont.xml distributed @@ -6276,9 +6276,9 @@ namespace oam void Oam::distributeFstabUpdates(std::string entry, std::string toPM) { - string cmd = startup::StartUp::installDir() + "/bin/infinidb status > /tmp/status.log"; + string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log"; system(cmd.c_str()); - if (!checkLogStatus("/tmp/status.log", "InfiniDB is running") ) + if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) return; ACK_FLAG ackflag = oam::ACK_YES; @@ -6861,7 +6861,7 @@ namespace oam } catch(...) { - cout << "ERROR: Problem deleting DBRoot in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem deleting DBRoot in the MariaDB Columnstore System Configuration file" << endl; exceptionControl("deleteConfig", API_FAILURE); } } diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp index a110343da..aa79b773a 100644 --- a/procmgr/processmanager.cpp +++ b/procmgr/processmanager.cpp @@ -1288,7 +1288,7 @@ void processMSG(messageqcpp::IOSocket* cfIos) log.writeLog(__LINE__, "ERROR: sysConfig->write", LOG_TYPE_ERROR); } - string cmd = "pdsh -a -x " + localHostName + " '" + startup::StartUp::installDir() + "/infinidb stop' > /dev/null 2>&1"; + string cmd = "pdsh -a -x " + localHostName + " '" + startup::StartUp::installDir() + "/columnstore stop' > /dev/null 2>&1"; system(cmd.c_str()); break; @@ -4439,15 +4439,15 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str if ( packageType == "deb" ) separator = "_"; //mariadb - calpontPackage = homedir + "/infinidb-*" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType; - mysqlPackage = homedir + "/infinidb-storage-engine" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType; - mysqldPackage = homedir + "/infinidb-mysql" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType; - calpontPackage1 = homedir + "/infinidb-libs" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType; - calpontPackage2 = homedir + "/infinidb-enterprise" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType; + calpontPackage = homedir + "/mariadbcolumnstore-*" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType; + mysqlPackage = homedir + "/mariadbcolumnstore-storage-engine" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType; + mysqldPackage = homedir + "/mariadbcolumnstore-mysql" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType; + calpontPackage1 = homedir + "/mariadbcolumnstore-libs" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType; + calpontPackage2 = homedir + "/mariadbcolumnstore-enterprise" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType; } else { - calpontPackage = homedir + "/infinidb*" + systemsoftware.Version + "-" + systemsoftware.Release + "*.bin.tar.gz"; + calpontPackage = homedir + "/mariadbcolumnstore*" + systemsoftware.Version + "-" + systemsoftware.Release + "*.bin.tar.gz"; mysqlPackage = calpontPackage; mysqldPackage = calpontPackage; } @@ -5181,9 +5181,9 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str string remoteHostName = (*pt1).HostName; //send start service commands - string cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/bin/infinidb restart;" + installDir + "/mysql/mysqld-Calpont restart' 0"; + string cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/bin/columnstore restart;" + installDir + "/mysql/mysqld-Calpont restart' 0"; system(cmd.c_str()); - log.writeLog(__LINE__, "addModule - restart infinidb service " + remoteModuleName, LOG_TYPE_DEBUG); + log.writeLog(__LINE__, "addModule - restart columnstore service " + remoteModuleName, LOG_TYPE_DEBUG); // add to monitor list moduleInfoList.insert(moduleList::value_type(remoteModuleName, 0)); diff --git a/procmon/processmonitor.cpp b/procmon/processmonitor.cpp index c916f6182..eb911fbfd 100644 --- a/procmon/processmonitor.cpp +++ b/procmon/processmonitor.cpp @@ -916,8 +916,8 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO if ( actIndicator == oam::REMOVE ) { log.writeLog(__LINE__, "STOPALL: uninstall Calpont RPMs", LOG_TYPE_DEBUG); if ( config.moduleType() == "um" ) { - system("rpm -e --nodeps $(rpm -qa | grep '^infinidb')"); - system("dpkg -P $(dpkg --get-selections | grep '^infinidb')"); + system("rpm -e --nodeps $(rpm -qa | grep '^mariadb-columnstore')"); + system("dpkg -P $(dpkg --get-selections | grep '^mariadb-columnstore')"); } else // pm { @@ -931,11 +931,11 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO system(cmd.c_str()); sleep(1); - system("rpm -e --nodeps $(rpm -qa | grep '^infinidb')"); - system("dpkg -P $(dpkg --get-selections | grep '^infinidb')"); + system("rpm -e --nodeps $(rpm -qa | grep '^mariadb-columnstore')"); + system("dpkg -P $(dpkg --get-selections | grep '^mariadb-columnstore')"); } // should get here is packages get removed correctly - 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()); exit (0); } @@ -1225,7 +1225,7 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO //send down notification oam.sendDeviceNotification(config.moduleName(), MODULE_DOWN); - //stop the mysql daemon and then infinidb + //stop the mysql daemon and then columnstore try { oam.actionMysqlCalpont(MYSQL_STOP); } @@ -1241,7 +1241,7 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO //sleep to give time for process-manager to finish up sleep(5); - 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()); exit (0); @@ -4414,7 +4414,7 @@ int ProcessMonitor::runHDFSTest() } else { - // retry since infinidb can startup before hadoop is full up + // retry since columnstore can startup before hadoop is full up int retry = 0; for ( ; retry < 12 ; retry++ ) { @@ -4649,22 +4649,22 @@ int ProcessMonitor::runUpgrade(std::string mysqlpw) for ( int i = 0 ; i < 10 ; i++ ) { //run upgrade script - string cmd = startup::StartUp::installDir() + "/bin/upgrade-infinidb.sh doupgrade --password=" + - mysqlpw + " --installdir=" + startup::StartUp::installDir() + " > " + "/tmp/upgrade-infinidb.log 2>&1"; + string cmd = startup::StartUp::installDir() + "/bin/upgrade-columnstore.sh doupgrade --password=" + + mysqlpw + " --installdir=" + startup::StartUp::installDir() + " > " + "/tmp/upgrade-columnstore.log 2>&1"; system(cmd.c_str()); - cmd = "/tmp/upgrade-infinidb.log"; + cmd = "/tmp/upgrade-columnstore.log"; if (oam.checkLogStatus(cmd, "OK")) { - log.writeLog(__LINE__, "upgrade-infinidb.sh: Successful return", LOG_TYPE_DEBUG); + log.writeLog(__LINE__, "upgrade-columnstore.sh: Successful return", LOG_TYPE_DEBUG); return oam::API_SUCCESS; } else { if (oam.checkLogStatus(cmd, "ERROR 1045") ) { - log.writeLog(__LINE__, "upgrade-infinidb.sh: Missing Password error, return success", LOG_TYPE_DEBUG); + log.writeLog(__LINE__, "upgrade-columnstore.sh: Missing Password error, return success", LOG_TYPE_DEBUG); return oam::API_SUCCESS; } - log.writeLog(__LINE__, "upgrade-infinidb.sh: Error return, check log /tmp/upgrade-status.log", LOG_TYPE_ERROR); + log.writeLog(__LINE__, "upgrade-columnstore.sh: Error return, check log /tmp/upgrade-status.log", LOG_TYPE_ERROR); //restart mysqld and retry try { oam.actionMysqlCalpont(MYSQL_RESTART); @@ -5011,8 +5011,8 @@ int ProcessMonitor::runMasterRep(std::string& masterLogFile, std::string& master { string ipAddr = (*pt1).IPAddr; - string logFile = "/tmp/master-rep-infinidb-" + moduleName + ".log"; - string cmd = startup::StartUp::installDir() + "/bin/master-rep-infinidb.sh --password=" + + string logFile = "/tmp/master-rep-columnstore-" + moduleName + ".log"; + string cmd = startup::StartUp::installDir() + "/bin/master-rep-columnstore.sh --password=" + mysqlpw + " --installdir=" + startup::StartUp::installDir() + " --hostIP=" + ipAddr + " > " + logFile + " 2>&1"; log.writeLog(__LINE__, "cmd = " + cmd, LOG_TYPE_DEBUG); @@ -5020,21 +5020,21 @@ int ProcessMonitor::runMasterRep(std::string& masterLogFile, std::string& master if (oam.checkLogStatus(logFile, "ERROR 1045") ) { if ( passwordError ) { - log.writeLog(__LINE__, "master-rep-infinidb.sh: MySQL Password Error", LOG_TYPE_ERROR); + log.writeLog(__LINE__, "master-rep-columnstore.sh: MySQL Password Error", LOG_TYPE_ERROR); return oam::API_FAILURE; } - log.writeLog(__LINE__, "master-rep-infinidb.sh: Missing Password error, go check for a password and retry", LOG_TYPE_DEBUG); + log.writeLog(__LINE__, "master-rep-columnstore.sh: Missing Password error, go check for a password and retry", LOG_TYPE_DEBUG); passwordError = true; break; } else { if (oam.checkLogStatus(logFile, "OK")) - log.writeLog(__LINE__, "master-rep-infinidb.sh: Successful return for node " + moduleName, LOG_TYPE_DEBUG); + log.writeLog(__LINE__, "master-rep-columnstore.sh: Successful return for node " + moduleName, LOG_TYPE_DEBUG); else { - log.writeLog(__LINE__, "master-rep-infinidb.sh: Error return, check log " + logFile, LOG_TYPE_ERROR); + log.writeLog(__LINE__, "master-rep-columnstore.sh: Error return, check log " + logFile, LOG_TYPE_ERROR); return oam::API_FAILURE; } } @@ -5051,7 +5051,7 @@ int ProcessMonitor::runMasterRep(std::string& masterLogFile, std::string& master if ( mysqlpw == oam::UnassignedName ) { - log.writeLog(__LINE__, "master-rep-infinidb.sh: MySQL Password Error", LOG_TYPE_ERROR); + log.writeLog(__LINE__, "master-rep-columnstore.sh: MySQL Password Error", LOG_TYPE_ERROR); return oam::API_FAILURE; } } @@ -5158,34 +5158,34 @@ int ProcessMonitor::runSlaveRep(std::string& masterLogFile, std::string& masterL bool passwordError = false; while(true) { - string cmd = startup::StartUp::installDir() + "/bin/slave-rep-infinidb.sh --password=" + - mysqlpw + " --installdir=" + startup::StartUp::installDir() + " --masteripaddr=" + masterIPAddress + " --masterlogfile=" + masterLogFile + " --masterlogpos=" + masterLogPos + + " --port=" + port + " > /tmp/slave-rep-infinidb.log 2>&1"; + string cmd = startup::StartUp::installDir() + "/bin/slave-rep-columnstore.sh --password=" + + mysqlpw + " --installdir=" + startup::StartUp::installDir() + " --masteripaddr=" + masterIPAddress + " --masterlogfile=" + masterLogFile + " --masterlogpos=" + masterLogPos + + " --port=" + port + " > /tmp/slave-rep-columnstore.log 2>&1"; log.writeLog(__LINE__, "cmd = " + cmd, LOG_TYPE_DEBUG); system(cmd.c_str()); - string logFile = "/tmp/slave-rep-infinidb.log"; + string logFile = "/tmp/slave-rep-columnstore.log"; if (oam.checkLogStatus(logFile, "ERROR 1045") ) { if ( passwordError ) { - log.writeLog(__LINE__, "slave-rep-infinidb.sh: MySQL Password Error", LOG_TYPE_ERROR); + log.writeLog(__LINE__, "slave-rep-columnstore.sh: MySQL Password Error", LOG_TYPE_ERROR); return oam::API_FAILURE; } - log.writeLog(__LINE__, "slave-rep-infinidb.sh: Missing Password error, go check for a password and retry", LOG_TYPE_DEBUG); + log.writeLog(__LINE__, "slave-rep-columnstore.sh: Missing Password error, go check for a password and retry", LOG_TYPE_DEBUG); passwordError = true; } else { if (oam.checkLogStatus(logFile, "OK")) { - log.writeLog(__LINE__, "slave-rep-infinidb.sh: Successful return", LOG_TYPE_DEBUG); + log.writeLog(__LINE__, "slave-rep-columnstore.sh: Successful return", LOG_TYPE_DEBUG); return oam::API_SUCCESS; } else { - log.writeLog(__LINE__, "slave-rep-infinidb.sh: Error return, check log /tmp/slave-rep-infinidb.log", LOG_TYPE_ERROR); + log.writeLog(__LINE__, "slave-rep-columnstore.sh: Error return, check log /tmp/slave-rep-columnstore.log", LOG_TYPE_ERROR); return oam::API_FAILURE; } } @@ -5201,7 +5201,7 @@ int ProcessMonitor::runSlaveRep(std::string& masterLogFile, std::string& masterL if ( mysqlpw == oam::UnassignedName ) { - log.writeLog(__LINE__, "slave-rep-infinidb.sh: MySQL Password Error", LOG_TYPE_ERROR); + log.writeLog(__LINE__, "slave-rep-columnstore.sh: MySQL Password Error", LOG_TYPE_ERROR); return oam::API_FAILURE; } } @@ -5235,25 +5235,25 @@ int ProcessMonitor::runDisableRep() if ( mysqlpw == oam::UnassignedName ) mysqlpw = ""; - string cmd = startup::StartUp::installDir() + "/bin/disable-rep-infinidb.sh --password=" + - mysqlpw + " --installdir=" + startup::StartUp::installDir() + " > /tmp/disable-rep-infinidb.log 2>&1"; + string cmd = startup::StartUp::installDir() + "/bin/disable-rep-columnstore.sh --password=" + + mysqlpw + " --installdir=" + startup::StartUp::installDir() + " > /tmp/disable-rep-columnstore.log 2>&1"; log.writeLog(__LINE__, "cmd = " + cmd, LOG_TYPE_DEBUG); system(cmd.c_str()); - cmd = "/tmp/disable-rep-infinidb.log"; + cmd = "/tmp/disable-rep-columnstore.log"; if (oam.checkLogStatus(cmd, "OK")) { - log.writeLog(__LINE__, "disable-rep-infinidb.sh: Successful return", LOG_TYPE_DEBUG); + log.writeLog(__LINE__, "disable-rep-columnstore.sh: Successful return", LOG_TYPE_DEBUG); return oam::API_SUCCESS; } else { if (oam.checkLogStatus(cmd, "ERROR 1045") ) { - log.writeLog(__LINE__, "disable-rep-infinidb.sh: Missing Password error, return success", LOG_TYPE_DEBUG); + log.writeLog(__LINE__, "disable-rep-columnstore.sh: Missing Password error, return success", LOG_TYPE_DEBUG); return oam::API_SUCCESS; } - log.writeLog(__LINE__, "disable-rep-infinidb.sh: Error return, check log /tmp/disable-rep-infinidb.log", LOG_TYPE_ERROR); + log.writeLog(__LINE__, "disable-rep-columnstore.sh: Error return, check log /tmp/disable-rep-columnstore.log", LOG_TYPE_ERROR); return oam::API_FAILURE; }