diff --git a/configure b/configure index ff9d7ee8d..1692d1f27 100755 --- a/configure +++ b/configure @@ -25533,8 +25533,7 @@ idb_common_includes='-I${idbinstall}/include -I/usr/local/include -I/usr/local/i idb_common_ldflags='-L${idbinstall}/lib -L/usr/local/lib' - - ac_config_files="$ac_config_files Makefile utils/Makefile utils/boost_idb/Makefile utils/startup/Makefile utils/common/Makefile utils/configcpp/Makefile utils/loggingcpp/Makefile utils/messageqcpp/Makefile utils/threadpool/Makefile utils/rwlock/Makefile utils/dataconvert/Makefile utils/joiner/Makefile utils/rowgroup/Makefile utils/cacheutils/Makefile utils/net-snmp/Makefile utils/funcexp/Makefile utils/udfsdk/Makefile utils/compress/Makefile utils/ddlcleanup/Makefile utils/batchloader/Makefile utils/mysqlcl_idb/Makefile utils/querystats/Makefile utils/jemalloc/Makefile utils/windowfunction/Makefile utils/idbdatafile/Makefile utils/idbhdfs/Makefile utils/idbhdfs/hdfs-12/Makefile utils/idbhdfs/hdfs-20/Makefile utils/winport/Makefile utils/thrift/Makefile utils/querytele/Makefile exemgr/Makefile ddlproc/Makefile dbcon/Makefile dbcon/ddlpackage/Makefile dbcon/ddlpackageproc/Makefile dbcon/dmlpackage/Makefile dbcon/dmlpackageproc/Makefile dbcon/execplan/Makefile dbcon/joblist/Makefile dbcon/mysql/Makefile dmlproc/Makefile oam/Makefile oam/etc/Makefile oam/install_scripts/Makefile oam/oamcpp/Makefile oam/post/Makefile oam/cloud/Makefile oamapps/Makefile oamapps/calpontConsole/Makefile oamapps/calpontDB/Makefile oamapps/postConfigure/Makefile oamapps/serverMonitor/Makefile oamapps/sessionWalker/Makefile oamapps/traphandler/Makefile oamapps/sendtrap/Makefile oamapps/calpontSupport/Makefile primitives/Makefile primitives/blockcache/Makefile primitives/linux-port/Makefile primitives/primproc/Makefile decomsvr/Makefile procmgr/Makefile procmon/Makefile snmpd/Makefile snmpd/etc/Makefile snmpd/snmpmanager/Makefile tools/Makefile tools/editem/Makefile tools/cplogger/Makefile tools/clearShm/Makefile tools/setConfig/Makefile tools/getConfig/Makefile tools/dbbuilder/Makefile tools/dbloadxml/Makefile tools/configMgt/Makefile tools/viewtablelock/Makefile tools/cleartablelock/Makefile tools/ddlcleanup/Makefile tools/idbmeminfo/Makefile versioning/Makefile versioning/BRM/Makefile writeengine/Makefile writeengine/shared/Makefile writeengine/index/Makefile writeengine/dictionary/Makefile writeengine/wrapper/Makefile writeengine/xml/Makefile writeengine/bulk/Makefile writeengine/client/Makefile writeengine/splitter/Makefile writeengine/server/Makefile writeengine/redistribute/Makefile net-snmp/Makefile" +ac_config_files="$ac_config_files Makefile utils/Makefile utils/boost_idb/Makefile utils/startup/Makefile utils/common/Makefile utils/configcpp/Makefile utils/loggingcpp/Makefile utils/messageqcpp/Makefile utils/threadpool/Makefile utils/rwlock/Makefile utils/dataconvert/Makefile utils/joiner/Makefile utils/rowgroup/Makefile utils/cacheutils/Makefile utils/net-snmp/Makefile utils/funcexp/Makefile utils/udfsdk/Makefile utils/compress/Makefile utils/ddlcleanup/Makefile utils/batchloader/Makefile utils/mysqlcl_idb/Makefile utils/querystats/Makefile utils/jemalloc/Makefile utils/windowfunction/Makefile utils/idbdatafile/Makefile utils/idbhdfs/Makefile utils/idbhdfs/hdfs-12/Makefile utils/idbhdfs/hdfs-20/Makefile utils/winport/Makefile utils/thrift/Makefile utils/querytele/Makefile exemgr/Makefile ddlproc/Makefile dbcon/Makefile dbcon/ddlpackage/Makefile dbcon/ddlpackageproc/Makefile dbcon/dmlpackage/Makefile dbcon/dmlpackageproc/Makefile dbcon/execplan/Makefile dbcon/joblist/Makefile dbcon/mysql/Makefile dmlproc/Makefile oam/Makefile oam/etc/Makefile oam/install_scripts/Makefile oam/oamcpp/Makefile oam/post/Makefile oam/cloud/Makefile oamapps/Makefile oamapps/mcsadmin/Makefile oamapps/calpontDB/Makefile oamapps/postConfigure/Makefile oamapps/serverMonitor/Makefile oamapps/sessionWalker/Makefile oamapps/traphandler/Makefile oamapps/sendtrap/Makefile oamapps/calpontSupport/Makefile primitives/Makefile primitives/blockcache/Makefile primitives/linux-port/Makefile primitives/primproc/Makefile decomsvr/Makefile procmgr/Makefile procmon/Makefile snmpd/Makefile snmpd/etc/Makefile snmpd/snmpmanager/Makefile tools/Makefile tools/editem/Makefile tools/cplogger/Makefile tools/clearShm/Makefile tools/setConfig/Makefile tools/getConfig/Makefile tools/dbbuilder/Makefile tools/dbloadxml/Makefile tools/configMgt/Makefile tools/viewtablelock/Makefile tools/cleartablelock/Makefile tools/ddlcleanup/Makefile tools/idbmeminfo/Makefile versioning/Makefile versioning/BRM/Makefile writeengine/Makefile writeengine/shared/Makefile writeengine/index/Makefile writeengine/dictionary/Makefile writeengine/wrapper/Makefile writeengine/xml/Makefile writeengine/bulk/Makefile writeengine/client/Makefile writeengine/splitter/Makefile writeengine/server/Makefile writeengine/redistribute/Makefile net-snmp/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -26144,7 +26143,7 @@ do "oam/post/Makefile" ) CONFIG_FILES="$CONFIG_FILES oam/post/Makefile" ;; "oam/cloud/Makefile" ) CONFIG_FILES="$CONFIG_FILES oam/cloud/Makefile" ;; "oamapps/Makefile" ) CONFIG_FILES="$CONFIG_FILES oamapps/Makefile" ;; - "oamapps/calpontConsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES oamapps/calpontConsole/Makefile" ;; + "oamapps/mcsadmin/Makefile" ) CONFIG_FILES="$CONFIG_FILES oamapps/mcsadmin/Makefile" ;; "oamapps/calpontDB/Makefile" ) CONFIG_FILES="$CONFIG_FILES oamapps/calpontDB/Makefile" ;; "oamapps/postConfigure/Makefile" ) CONFIG_FILES="$CONFIG_FILES oamapps/postConfigure/Makefile" ;; "oamapps/serverMonitor/Makefile" ) CONFIG_FILES="$CONFIG_FILES oamapps/serverMonitor/Makefile" ;; diff --git a/configure.ac b/configure.ac index e13e5cbe9..3c08756cc 100644 --- a/configure.ac +++ b/configure.ac @@ -217,7 +217,7 @@ AC_CONFIG_FILES([ oam/post/Makefile oam/cloud/Makefile oamapps/Makefile - oamapps/calpontConsole/Makefile + oamapps/mcsadmin/Makefile oamapps/calpontDB/Makefile oamapps/postConfigure/Makefile oamapps/serverMonitor/Makefile diff --git a/gitadd b/gitadd index 82859a69d..dfe5af352 100755 --- a/gitadd +++ b/gitadd @@ -1,11 +1,25 @@ -git add build/infinidb.spec.in -git add oam/etc/ConsoleCmds.xml -git add oam/install_scripts/Makefile -git add oam/install_scripts/pre-uninstall -git add oam/oamcpp/liboamcpp.cpp -git add oam/oamcpp/liboamcpp.h -git add oamapps/calpontConsole/calpontConsole.cpp -git add procmgr/processmanager.cpp -git add procmgr/processmanager.h -git add procmon/processmonitor.cpp -git add procmon/processmonitor.h +git add configure +git add configure.ac +git add gitadd +git add oam/install_scripts/calpontAlias +git add oam/install_scripts/calpontUninstall.sh +git add oam/install_scripts/postInstall.sh +git add oamapps/Makefile.am +git add oamapps/Makefile.in +git add oamapps/calpontSupport/calpontSupport.cpp +git add oamapps/calpontSupport/softwareReport.sh +git add oamapps/postConfigure/helpers.cpp +git add tools/configMgt/autoInstaller.cpp +git add tools/configMgt/stackReleaseChecker.cpp +git add utils/autoconf/configure.ac +git add utils/loggingcpp/SubsystemIDs.txt +git add utils/loggingcpp/messagelog.cpp +git add utils/loggingcpp/tdriver.cpp +git add utils/prat/getmodules.sh +git add utils/scenarios/common/sh/testExecEngine.sh +git add utils/scenarios/perf/source/pf/common/exeStreamTest.sh +git add utils/scenarios/perf/source/pf/common/setPMConfig.sh +git add utils/scenarios/perf/source/pf/common/setStackConfig.sh +git add utils/scenarios/perf/source/pf/common/setTestEnv.sh +git add utils/scenarios/perf/source/pf/common/step1.sh +git add utils/scenarios/perf/source/pf/common/step2.sh diff --git a/oam/install_scripts/calpontAlias b/oam/install_scripts/calpontAlias index b19fcb96b..4869d6bd1 100644 --- a/oam/install_scripts/calpontAlias +++ b/oam/install_scripts/calpontAlias @@ -1,8 +1,8 @@ # InfiniDB Alias Commands # alias idbmysql='/usr/local/Calpont/mysql/bin/mysql --defaults-file=/usr/local/Calpont/mysql/my.cnf -u root' -alias cc=/usr/local/Calpont/bin/calpontConsole -alias cmconsole=/usr/local/Calpont/bin/calpontConsole +alias cc=/usr/local/Calpont/bin/mcsadmin +alias mscadmin=/usr/local/Calpont/bin/mscadmin alias home='cd /usr/local/Calpont/' alias log='cd /var/log/Calpont/' alias core='cd /var/log/Calpont/corefiles' diff --git a/oam/install_scripts/calpontUninstall.sh b/oam/install_scripts/calpontUninstall.sh index e13bdf8aa..6c35ae75b 100755 --- a/oam/install_scripts/calpontUninstall.sh +++ b/oam/install_scripts/calpontUninstall.sh @@ -79,7 +79,7 @@ send_user "\nPerforming InfiniDB System Uninstall\n\n" # send_user "Shutdown InfiniDB System " expect -re {[$#] } -send "$INFINIDB_INSTALL_DIR/bin/calpontConsole shutdownsystem y\n" +send "$INFINIDB_INSTALL_DIR/bin/mcsadmin shutdownsystem y\n" expect { "shutdownSystem " { send_user "DONE" } } diff --git a/oam/install_scripts/postInstall.sh b/oam/install_scripts/postInstall.sh index 11783a5e0..d38724a1d 100755 --- a/oam/install_scripts/postInstall.sh +++ b/oam/install_scripts/postInstall.sh @@ -76,7 +76,7 @@ send_user "\nPerforming Calpont RPM System Install\n\n" # send_user "Stop Calpont System " expect -re "# " -send "$INSTALLDIR/bin/calpontConsole stopSystem INSTALL y\n" +send "$INSTALLDIR/bin/mcsadmin stopSystem INSTALL y\n" expect { -re "# " { send_user "DONE" } -re "**** stopSystem Failed" { send_user "INFO: System not running" } diff --git a/oamapps/Makefile.am b/oamapps/Makefile.am index 871eb5926..95ef5f9d0 100644 --- a/oamapps/Makefile.am +++ b/oamapps/Makefile.am @@ -17,7 +17,7 @@ # $Id: Makefile.am 878 2009-04-03 20:34:32Z rdempsey $ -SUBDIRS = calpontConsole calpontDB postConfigure serverMonitor traphandler \ +SUBDIRS = mcsadmin calpontDB postConfigure serverMonitor traphandler \ sendtrap calpontSupport test: diff --git a/oamapps/Makefile.in b/oamapps/Makefile.in index fd81b6d62..deb0e6382 100644 --- a/oamapps/Makefile.in +++ b/oamapps/Makefile.in @@ -209,7 +209,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ toolsdir = @toolsdir@ -SUBDIRS = calpontConsole calpontDB postConfigure serverMonitor traphandler \ +SUBDIRS = mcsadmin calpontDB postConfigure serverMonitor traphandler \ sendtrap calpontSupport all: all-recursive diff --git a/oamapps/calpontSupport/calpontSupport.cpp b/oamapps/calpontSupport/calpontSupport.cpp index 044b2fa26..9d9e5d61b 100644 --- a/oamapps/calpontSupport/calpontSupport.cpp +++ b/oamapps/calpontSupport/calpontSupport.cpp @@ -204,11 +204,11 @@ void reportThread(string reporttype) system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - cmd = "echo '################# calpontConsole getLogConfig ################# ' >> " + outputFile; + cmd = "echo '################# mcsadmin getLogConfig ################# ' >> " + outputFile; system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - cmd = installDir + "/bin/calpontConsole getLogConfig >> " + outputFile; + cmd = installDir + "/bin/mcsadmin getLogConfig >> " + outputFile; system(cmd.c_str()); } else @@ -236,11 +236,11 @@ void reportThread(string reporttype) system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - cmd = "echo '################# calpontConsole getSystemNetworkConfig ################# ' >> " + outputFile; + cmd = "echo '################# mcsadmin getSystemNetworkConfig ################# ' >> " + outputFile; system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - cmd = installDir + "/bin/calpontConsole getSystemNetworkConfig >> " + outputFile; + cmd = installDir + "/bin/mcsadmin getSystemNetworkConfig >> " + outputFile; system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; @@ -249,11 +249,11 @@ void reportThread(string reporttype) system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - cmd = "echo '################# calpontConsole getModuleTypeConfig ################# ' >> " + outputFile; + cmd = "echo '################# mcsadmin getModuleTypeConfig ################# ' >> " + outputFile; system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - cmd = installDir + "/bin/calpontConsole getModuleTypeConfig >> " + outputFile; + cmd = installDir + "/bin/mcsadmin getModuleTypeConfig >> " + outputFile; system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; @@ -262,11 +262,11 @@ void reportThread(string reporttype) system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - cmd = "echo '################# calpontConsole getStorageConfig ################# ' >> " + outputFile; + cmd = "echo '################# mcsadmin getStorageConfig ################# ' >> " + outputFile; system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - cmd = installDir + "/bin/calpontConsole getStorageConfig >> " + outputFile; + cmd = installDir + "/bin/mcsadmin getStorageConfig >> " + outputFile; system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; @@ -275,11 +275,11 @@ void reportThread(string reporttype) system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - cmd = "echo '################# calpontConsole getStorageStatus ################# ' >> " + outputFile; + cmd = "echo '################# mcsadmin getStorageStatus ################# ' >> " + outputFile; system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - cmd = installDir + "/bin/calpontConsole getStorageStatus >> " + outputFile; + cmd = installDir + "/bin/mcsadmin getStorageStatus >> " + outputFile; system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; @@ -288,11 +288,11 @@ void reportThread(string reporttype) system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - cmd = "echo '################# calpontConsole getSystemInfo ################# ' >> " + outputFile; + cmd = "echo '################# mcsadmin getSystemInfo ################# ' >> " + outputFile; system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - cmd = installDir + "/bin/calpontConsole getSystemInfo >> " + outputFile; + cmd = installDir + "/bin/mcsadmin getSystemInfo >> " + outputFile; system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; @@ -312,20 +312,20 @@ void reportThread(string reporttype) if (reportType == "resource" ) { if (LOCAL) { - cmd = "echo '################# calpontConsole getModuleResourceUsage ################# ' >> " + outputFile; + cmd = "echo '################# mcsadmin getModuleResourceUsage ################# ' >> " + outputFile; system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - string cmd = installDir + "/bin/calpontConsole getModuleResourceUsage " + localModule + " >> " + outputFile; + string cmd = installDir + "/bin/mcsadmin getModuleResourceUsage " + localModule + " >> " + outputFile; system(cmd.c_str()); } else { - cmd = "echo '################# calpontConsole getSystemResourceUsage ################# ' >> " + outputFile; + cmd = "echo '################# mcsadmin getSystemResourceUsage ################# ' >> " + outputFile; system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - string cmd = installDir + "/bin/calpontConsole getSystemResourceUsage >> " + outputFile; + string cmd = installDir + "/bin/mcsadmin getSystemResourceUsage >> " + outputFile; system(cmd.c_str()); } } @@ -947,11 +947,11 @@ int main(int argc, char *argv[]) system("echo ' ' >> calpontSupportReport.txt"); system("echo '******************** Active Queries ********************' >> calpontSupportReport.txt"); system("echo ' ' >> calpontSupportReport.txt"); - cmd = "echo '################# calpontConsole getActiveSqlStatement ################# ' >> calpontSupportReport.txt"; + cmd = "echo '################# mcsadmin getActiveSqlStatement ################# ' >> calpontSupportReport.txt"; system(cmd.c_str()); cmd = "echo ' ' >> calpontSupportReport.txt"; system(cmd.c_str()); - cmd = installDir + "/bin/calpontConsole getActiveSqlStatement >> calpontSupportReport.txt"; + cmd = installDir + "/bin/mcsadmin getActiveSqlStatement >> calpontSupportReport.txt"; system(cmd.c_str()); cmd = "cat calpontSupportReport.txt > " + localModule + "_dbmsReport.txt"; diff --git a/oamapps/calpontSupport/softwareReport.sh b/oamapps/calpontSupport/softwareReport.sh index f043552a4..3877743e0 100755 --- a/oamapps/calpontSupport/softwareReport.sh +++ b/oamapps/calpontSupport/softwareReport.sh @@ -30,9 +30,9 @@ echo " " echo " " echo "-- Calpont Package Details --" echo " " -echo "################# calpontConsole getcalpontsoftwareinfo #################" +echo "################# mcsadmin getcalpontsoftwareinfo #################" echo " " -$INSTALLDIR/bin/calpontConsole getcalpontsoftwareinfo +$INSTALLDIR/bin/mcsadmin getcalpontsoftwareinfo echo " " echo "-- Calpont Release Number file --" @@ -44,9 +44,9 @@ cat $INSTALLDIR/releasenum echo " " echo "-- Calpont Storage Configuration --" echo " " -echo "################# calpontConsole getStorageConfig #################" +echo "################# mcsadmin getStorageConfig #################" echo " " -$INSTALLDIR/bin/calpontConsole getStorageConfig +$INSTALLDIR/bin/mcsadmin getStorageConfig } > /tmp/${MODULE}_softwareReport.txt diff --git a/oamapps/postConfigure/helpers.cpp b/oamapps/postConfigure/helpers.cpp index 7ef416281..c169dbd71 100644 --- a/oamapps/postConfigure/helpers.cpp +++ b/oamapps/postConfigure/helpers.cpp @@ -79,7 +79,7 @@ bool waitForActive() { Oam oam; - const string cmd = installDir + "/bin/calpontConsole getsystemstatus > /tmp/status.log"; + const string cmd = installDir + "/bin/mcsadmin getsystemstatus > /tmp/status.log"; system(cmd.c_str()); for ( int i = 0 ; i < 120 ; i ++ ) diff --git a/tools/configMgt/autoInstaller.cpp b/tools/configMgt/autoInstaller.cpp index b7c2324ef..035228ce3 100644 --- a/tools/configMgt/autoInstaller.cpp +++ b/tools/configMgt/autoInstaller.cpp @@ -736,7 +736,7 @@ CONFIGDONE: cout << "Shutdown System " << flush; - cmd = "./remote_command.sh " + installParentModuleIPAddr + " " + systemUser + " " + password + " '" + installDir + "/Calpont/bin/calpontConsole shutdownsystem Force y' 'Successful shutdown' Error 60 " + debug_flag; + cmd = "./remote_command.sh " + installParentModuleIPAddr + " " + systemUser + " " + password + " '" + installDir + "/Calpont/bin/mcsadmin shutdownsystem Force y' 'Successful shutdown' Error 60 " + debug_flag; rtnCode = system(cmd.c_str()); if (rtnCode == 0) cout << "DONE" << endl; diff --git a/tools/configMgt/stackReleaseChecker.cpp b/tools/configMgt/stackReleaseChecker.cpp index 5f9d35884..0f1bb5a6c 100644 --- a/tools/configMgt/stackReleaseChecker.cpp +++ b/tools/configMgt/stackReleaseChecker.cpp @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) if (!VERBOSE) cmd = "./remote_command.sh " + installParentModuleHostName + " " + systemUser + " " + password + " 'cat " + installDir + "/releasenum' 'release=' cat: 10 " + debug_flag; else - cmd = "./remote_command.sh " + installParentModuleHostName + " " + systemUser + " " + password + " '" + installDir + "/bin/calpontConsole getcalpontsoftware' 'tools' Error 10 " + debug_flag; + cmd = "./remote_command.sh " + installParentModuleHostName + " " + systemUser + " " + password + " '" + installDir + "/bin/mcsadmin getcalpontsoftware' 'tools' Error 10 " + debug_flag; cout << "***** Calpont InfiniDB Package Release Information for stack '" << tempSystem << "' *****" << endl << endl; @@ -161,7 +161,7 @@ int main(int argc, char *argv[]) cout << "***** Status of stack '" << tempSystem << "' *****" << endl << endl; - cmd = "./remote_command.sh " + installParentModuleHostName + " " + systemUser + " " + password + " '" + installDir + "/bin/calpontConsole getsystems' dummy Error 10 " + debug_flag; + cmd = "./remote_command.sh " + installParentModuleHostName + " " + systemUser + " " + password + " '" + installDir + "/bin/mcsadmin getsystems' dummy Error 10 " + debug_flag; system(cmd.c_str()); diff --git a/utils/autoconf/configure.ac b/utils/autoconf/configure.ac index ae2a64193..663743c54 100644 --- a/utils/autoconf/configure.ac +++ b/utils/autoconf/configure.ac @@ -217,7 +217,7 @@ AC_CONFIG_FILES([ oam/post/Makefile oam/cloud/Makefile oamapps/Makefile - oamapps/calpontConsole/Makefile + oamapps/mcsadmin/Makefile oamapps/calpontDB/Makefile oamapps/postConfigure/Makefile oamapps/serverMonitor/Makefile diff --git a/utils/loggingcpp/SubsystemIDs.txt b/utils/loggingcpp/SubsystemIDs.txt index 5e960eaa5..409aee8ca 100644 --- a/utils/loggingcpp/SubsystemIDs.txt +++ b/utils/loggingcpp/SubsystemIDs.txt @@ -11,7 +11,7 @@ 04 - execplan 05 - joblist 06 - resultset -07 - calpontConsole +07 - cmcsadmin 08 - oamcpp 09 - servermonitor 10 - traphandler diff --git a/utils/loggingcpp/messagelog.cpp b/utils/loggingcpp/messagelog.cpp index 51435564a..07bb182c6 100644 --- a/utils/loggingcpp/messagelog.cpp +++ b/utils/loggingcpp/messagelog.cpp @@ -52,7 +52,7 @@ const vector SubsystemID = ba::list_of ("execplan") // id = 4 ("joblist") // id = 5 ("resultset") // id = 6 - ("calpontConsole") // id = 7 + ("mcsadmin") // id = 7 ("oamcpp") // id = 8 ("ServerMonitor") // id = 9 ("traphandler") // id = 10 diff --git a/utils/loggingcpp/tdriver.cpp b/utils/loggingcpp/tdriver.cpp index 9fc8a733f..a90bb2ec4 100644 --- a/utils/loggingcpp/tdriver.cpp +++ b/utils/loggingcpp/tdriver.cpp @@ -127,7 +127,7 @@ void m1() MessageLog ml3(lid3); args.reset(); m.reset(); - args.add("subsystem 7 = calpontConsole test"); + args.add("subsystem 7 = mcsadmin test"); m.format(args); ml3.logDebugMessage(m); Config::deleteInstanceMap(); diff --git a/utils/prat/getmodules.sh b/utils/prat/getmodules.sh index 46a58ff7b..55fc2fb57 100644 --- a/utils/prat/getmodules.sh +++ b/utils/prat/getmodules.sh @@ -35,7 +35,7 @@ then fi # issue Calpont console command and send the output to a file -/usr/local/Calpont/bin/calpontConsole getsystemnetworkconfig ACK_YES | +/usr/local/Calpont/bin/mcsadmin getsystemnetworkconfig ACK_YES | egrep -w 'Director|User|Performance' | awk -F" " '{print $1"\t" $2"\t" $3"\t" $4"\t" $6}' > /tmp/modulelist.txt # diff --git a/utils/scenarios/common/sh/testExecEngine.sh b/utils/scenarios/common/sh/testExecEngine.sh index 2ff841948..5d8d78d97 100755 --- a/utils/scenarios/common/sh/testExecEngine.sh +++ b/utils/scenarios/common/sh/testExecEngine.sh @@ -60,10 +60,10 @@ function logEnvInfo { # $2 = a or b, b=before test run, a=after test run # cp /usr/local/Calpont/etc/Calpont.xml $1/. - /usr/local/Calpont/bin/calpontConsole getcalpontsoftwareinfo > $1/getcalpontsoftwareinfo.log - /usr/local/Calpont/bin/calpontConsole getsystemstatus > $1/getSystemStatus.$2.log - /usr/local/Calpont/bin/calpontConsole getsystemnetwork > $1/getSystemNetwork.$2.log - /usr/local/Calpont/bin/calpontConsole getprocessstatus > $1/getProcessStatus.$2.log + /usr/local/Calpont/bin/mcsadmin getcalpontsoftwareinfo > $1/getcalpontsoftwareinfo.log + /usr/local/Calpont/bin/mcsadmin getsystemstatus > $1/getSystemStatus.$2.log + /usr/local/Calpont/bin/mcsadmin getsystemnetwork > $1/getSystemNetwork.$2.log + /usr/local/Calpont/bin/mcsadmin getprocessstatus > $1/getProcessStatus.$2.log } #========================================================================================= # log environment info diff --git a/utils/scenarios/perf/source/pf/common/exeStreamTest.sh b/utils/scenarios/perf/source/pf/common/exeStreamTest.sh index d938febb6..24ca0efca 100755 --- a/utils/scenarios/perf/source/pf/common/exeStreamTest.sh +++ b/utils/scenarios/perf/source/pf/common/exeStreamTest.sh @@ -50,15 +50,15 @@ while [ $k -le $repeatNum ] do if [ $restart == Y ] || [ $restart == y ] then - /usr/local/Calpont/bin/calpontConsole restartsystem y + /usr/local/Calpont/bin/mcsadmin restartsystem y sleep 90 fi mkdir $k cd $k cp /usr/local/Calpont/etc/Calpont.xml . - /usr/local/Calpont/bin/calpontConsole getCalpontSoftware >CalpontSoftware.txt + /usr/local/Calpont/bin/mcsadmin getCalpontSoftware >CalpontSoftware.txt ls -al /mnt/pm*/usr/local/Calpont/data* > dbRoots.txt - /usr/local/Calpont/bin/calpontConsole getProcessStatus >stackConfigBefore.txt + /usr/local/Calpont/bin/mcsadmin getProcessStatus >stackConfigBefore.txt $exeCommand > $logFileName 2>&1 # if [ $streamNum == 1_7 ] @@ -71,7 +71,7 @@ do done fi # - /usr/local/Calpont/bin/calpontConsole getProcessStatus >stackConfigAfter.txt + /usr/local/Calpont/bin/mcsadmin getProcessStatus >stackConfigAfter.txt /home/pf/auto/common/extractstartstoptimes.sh cd .. ((k++)) diff --git a/utils/scenarios/perf/source/pf/common/setPMConfig.sh b/utils/scenarios/perf/source/pf/common/setPMConfig.sh index 96d7bc3bf..f967486e4 100755 --- a/utils/scenarios/perf/source/pf/common/setPMConfig.sh +++ b/utils/scenarios/perf/source/pf/common/setPMConfig.sh @@ -13,7 +13,7 @@ echo Start - Set PM configuration # # Stopping the Calpont software -/usr/local/Calpont/bin/calpontConsole stopsystem y ACK_YES +/usr/local/Calpont/bin/mcsadmin stopsystem y ACK_YES # # set maximum number of PMs possible for the stack maxPMs=4 @@ -26,7 +26,7 @@ numPMs=$1 #----------------------------------------------------------------------------- k=1 while [ $k -le $maxPMs ]; do - /usr/local/Calpont/bin/calpontConsole enableModule pm$k ACK_YES + /usr/local/Calpont/bin/mcsadmin enableModule pm$k ACK_YES ((k++)) done #----------------------------------------------------------------------------- @@ -34,12 +34,12 @@ done #----------------------------------------------------------------------------- k=$maxPMs while [ $k -gt $numPMs ]; do - /usr/local/Calpont/bin/calpontConsole disableModule pm$k ACK_YES + /usr/local/Calpont/bin/mcsadmin disableModule pm$k ACK_YES ((k--)) done #----------------------------------------------------------------------------- # Starting the Calpont software -/usr/local/Calpont/bin/calpontConsole startsystem y ACK_YES +/usr/local/Calpont/bin/mcsadmin startsystem y ACK_YES sleep 60 echo *-*-*-*-*-*-*-*-*-*-*-*-*-*-* echo End - Set PM configuration diff --git a/utils/scenarios/perf/source/pf/common/setStackConfig.sh b/utils/scenarios/perf/source/pf/common/setStackConfig.sh index 814deb34d..2d55eadd8 100755 --- a/utils/scenarios/perf/source/pf/common/setStackConfig.sh +++ b/utils/scenarios/perf/source/pf/common/setStackConfig.sh @@ -14,7 +14,7 @@ echo Start - Set stack configuration # # Stopping the Calpont software -/usr/local/Calpont/bin/calpontConsole stopsystem y ACK_YES +/usr/local/Calpont/bin/mcsadmin stopsystem y ACK_YES # # set maximum number of UMs and PMs possible the stack maxUMs=2 @@ -29,7 +29,7 @@ numPMs=$2 #----------------------------------------------------------------------------- k=1 while [ $k -le $maxUMs ]; do - /usr/local/Calpont/bin/calpontConsole enableModule um$k ACK_YES + /usr/local/Calpont/bin/mcsadmin enableModule um$k ACK_YES ((k++)) done #----------------------------------------------------------------------------- @@ -37,7 +37,7 @@ done #----------------------------------------------------------------------------- k=$maxUMs while [ $k -gt $numUMs ]; do - /usr/local/Calpont/bin/calpontConsole disableModule um$k ACK_YES + /usr/local/Calpont/bin/mcsadmin disableModule um$k ACK_YES ((k--)) done #----------------------------------------------------------------------------- @@ -45,7 +45,7 @@ done #----------------------------------------------------------------------------- k=1 while [ $k -le $maxPMs ]; do - /usr/local/Calpont/bin/calpontConsole enableModule pm$k ACK_YES + /usr/local/Calpont/bin/mcsadmin enableModule pm$k ACK_YES ((k++)) done #----------------------------------------------------------------------------- @@ -53,7 +53,7 @@ done #----------------------------------------------------------------------------- k=$maxPMs while [ $k -gt $numPMs ]; do - /usr/local/Calpont/bin/calpontConsole disableModule pm$k ACK_YES + /usr/local/Calpont/bin/mcsadmin disableModule pm$k ACK_YES ((k--)) done #----------------------------------------------------------------------------- diff --git a/utils/scenarios/perf/source/pf/common/setTestEnv.sh b/utils/scenarios/perf/source/pf/common/setTestEnv.sh index de25c4888..fd99f4f30 100755 --- a/utils/scenarios/perf/source/pf/common/setTestEnv.sh +++ b/utils/scenarios/perf/source/pf/common/setTestEnv.sh @@ -21,7 +21,7 @@ setNum=$3 # /home/pf/auto/common/setStackConfig.sh $numUMs $numPMs /home/pf/auto/common/setDBRoots.sh $setNum -/usr/local/Calpont/bin/calpontConsole startsystem +/usr/local/Calpont/bin/mcsadmin startsystem sleep 90 # # End of script diff --git a/utils/scenarios/perf/source/pf/common/step1.sh b/utils/scenarios/perf/source/pf/common/step1.sh index de25c4888..fd99f4f30 100755 --- a/utils/scenarios/perf/source/pf/common/step1.sh +++ b/utils/scenarios/perf/source/pf/common/step1.sh @@ -21,7 +21,7 @@ setNum=$3 # /home/pf/auto/common/setStackConfig.sh $numUMs $numPMs /home/pf/auto/common/setDBRoots.sh $setNum -/usr/local/Calpont/bin/calpontConsole startsystem +/usr/local/Calpont/bin/mcsadmin startsystem sleep 90 # # End of script diff --git a/utils/scenarios/perf/source/pf/common/step2.sh b/utils/scenarios/perf/source/pf/common/step2.sh index 4373916ef..1cc54e4e4 100755 --- a/utils/scenarios/perf/source/pf/common/step2.sh +++ b/utils/scenarios/perf/source/pf/common/step2.sh @@ -46,15 +46,15 @@ while [ $k -le $repeatNum ] do if [ $restart == Y ] || [ $restart == y ] then - /usr/local/Calpont/bin/calpontConsole restartsystem y + /usr/local/Calpont/bin/mcsadmin restartsystem y sleep 90 fi mkdir $k cd $k cp /usr/local/Calpont/etc/Calpont.xml . - /usr/local/Calpont/bin/calpontConsole getCalpontSoftware >CalpontSoftware.txt + /usr/local/Calpont/bin/mcsadmin getCalpontSoftware >CalpontSoftware.txt ls -al /usr/local/Calpont/data* > dbRoots.txt - /usr/local/Calpont/bin/calpontConsole getProcessStatus >stackConfigBefore.txt + /usr/local/Calpont/bin/mcsadmin getProcessStatus >stackConfigBefore.txt $exeCommand > $logFileName 2>&1 # if [ $streamNum == 1_7 ] @@ -67,7 +67,7 @@ do done fi # - /usr/local/Calpont/bin/calpontConsole getProcessStatus >stackConfigAfter.txt + /usr/local/Calpont/bin/mcsadmin getProcessStatus >stackConfigAfter.txt cd .. ((k++)) done