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

change calpontConsole to mcsadmin

Browse Source
This commit is contained in:
david hill
2016-05-09 14:37:48 -05:00
parent 96076af522
commit e077644376
25 changed files with 88 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/autoconf/configure.ac
View File

@ -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

2
utils/loggingcpp/SubsystemIDs.txt
View File

@ -11,7 +11,7 @@
04 - execplan
05 - joblist
06 - resultset
07 - calpontConsole
07 - cmcsadmin
08 - oamcpp
09 - servermonitor
10 - traphandler

2
utils/loggingcpp/messagelog.cpp
View File

@ -52,7 +52,7 @@ const vector<string> 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

2
utils/loggingcpp/tdriver.cpp
View File

@ -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();

2
utils/prat/getmodules.sh
View File

@ -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
#

8
utils/scenarios/common/sh/testExecEngine.sh
View File

@ -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

8
utils/scenarios/perf/source/pf/common/exeStreamTest.sh
View File

@ -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++))

8
utils/scenarios/perf/source/pf/common/setPMConfig.sh
View File

@ -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

10
utils/scenarios/perf/source/pf/common/setStackConfig.sh
View File

@ -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
#-----------------------------------------------------------------------------

2
utils/scenarios/perf/source/pf/common/setTestEnv.sh
View File

@ -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

2
utils/scenarios/perf/source/pf/common/step1.sh
View File

@ -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

8
utils/scenarios/perf/source/pf/common/step2.sh
View File

@ -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