YPT / jmeter · Commits

Go to a project

Authored by Rong
Commit 03438afe7dfbe9b0e9be40a93560e2ed6053c8ac 1 parent e51b5565

auto commit by shell by gr

Inline Side-by-side
Showing 1 changed file with 12 additions and 17 deletions
@@ -44,27 +44,22 @@ done @@ -44,27 +44,22 @@ done
44 44
45 PATH_JMETER_HOME="/opt/jmeter" 45 PATH_JMETER_HOME="/opt/jmeter"
46 PATH_JMETER_LOG="/Data/logs/jmeter" 46 PATH_JMETER_LOG="/Data/logs/jmeter"
47 -PATH_SHELL_LOG="${PATH_JMETER_LOG}/runtime.log"  
48 -if [ ! -f $PATH_SHELL_LOG ];then  
49 -echo 1  
50 -echo > $PATH_SHELL_LOG  
51 -fi  
52 #CMD_PS_JMETER="ps -ef| grep -e \"${PATH_JMETER_HOME}/bin/jmeter.*-n.*-t.*-X\" -e \"java -server -XX:+HeapDumpOnOutOfMemoryError.*-XX:+CMSClassUnloadingEnabled -jar ${PATH_JMETER_HOME}/bin/ApacheJMeter.jar -n -t\" -e \"${PATH_JMETER_HOME}/bin/jmeter-server\" -e \"${PATH_JMETER_HOME}/bin/jmeter.*-Djava.rmi.server.hostname=\" -e \"java -server -XX:+HeapDumpOnOutOfMemoryError.*-jar ${PATH_JMETER_HOME}/bin/ApacheJMeter.jar -Dserver_port=\" | grep -v grep"; 47 #CMD_PS_JMETER="ps -ef| grep -e \"${PATH_JMETER_HOME}/bin/jmeter.*-n.*-t.*-X\" -e \"java -server -XX:+HeapDumpOnOutOfMemoryError.*-XX:+CMSClassUnloadingEnabled -jar ${PATH_JMETER_HOME}/bin/ApacheJMeter.jar -n -t\" -e \"${PATH_JMETER_HOME}/bin/jmeter-server\" -e \"${PATH_JMETER_HOME}/bin/jmeter.*-Djava.rmi.server.hostname=\" -e \"java -server -XX:+HeapDumpOnOutOfMemoryError.*-jar ${PATH_JMETER_HOME}/bin/ApacheJMeter.jar -Dserver_port=\" | grep -v grep";
53 CMD_PS_JMETER="ps -ef | grep \"jar /opt/jmeter/bin/.*-n -t ${PATH_JMETER_HOME}${s}\" | grep -v grep" 48 CMD_PS_JMETER="ps -ef | grep \"jar /opt/jmeter/bin/.*-n -t ${PATH_JMETER_HOME}${s}\" | grep -v grep"
54 -CMD_KILL_JMETER="${CMD_PS_JMETER} | cut -c 9-15 | xargs kill -9 1>${PATH_SHELL_LOG} 2>&1"  
55 -CMD_CLEAR_JMETERLOG="echo > ${PATH_JMETER_LOG}/jmeter.jtl;echo > ${PATH_JMETER_LOG}/jmeterRun.log;echo > ${PATH_JMETER_LOG}/runtime.log; 1>${PATH_SHELL_LOG} 2>&1"  
56 -CMD_RESTART_MONITOR="${PATH_JMETER_HOME}/shell/restart_YPT_AUTO_MONITOR.sh 1>${PATH_SHELL_LOG} 2>&1"  
57 -CMD_STOP_MONITOR="${CMD_RESTART_MONITOR} stop 1>${PATH_SHELL_LOG} 2>&1"  
58 -#CMD_UPDATE_SVN="svn up ${PATH_JMETER_HOME} 1>${PATH_SHELL_LOG} 2>&1"  
59 -CMD_SYNC_SYSTEMTIME="ntpdate asia.pool.ntp.org 1>${PATH_SHELL_LOG} 2>&1" 49 +CMD_KILL_JMETER="${CMD_PS_JMETER} | cut -c 9-15 | xargs kill -9"
  50 +CMD_CLEAR_JMETERLOG="echo > ${PATH_JMETER_LOG}/jmeter.jtl;echo > ${PATH_JMETER_LOG}/jmeterRun.log;echo > ${PATH_JMETER_LOG}/runtime.log;"
  51 +CMD_RESTART_MONITOR="${PATH_JMETER_HOME}/shell/restart_YPT_AUTO_MONITOR.sh"
  52 +CMD_STOP_MONITOR="${CMD_RESTART_MONITOR} stop"
  53 +#CMD_UPDATE_SVN="svn up ${PATH_JMETER_HOME}"
  54 +CMD_SYNC_SYSTEMTIME="ntpdate asia.pool.ntp.org"
60 55
61 HOST_NAME=$(hostname) 56 HOST_NAME=$(hostname)
62 IP=$(/sbin/ip addr show | grep eth | grep inet | awk '{print $2}' | awk -F '/' '{print $1}') 57 IP=$(/sbin/ip addr show | grep eth | grep inet | awk '{print $2}' | awk -F '/' '{print $1}')
63 58
64 function startJmeter(){ 59 function startJmeter(){
65 -echo "[startJmeter]脚本路径：${PATH_JMETER_HOME}${s}" >> $PATH_SHELL_LOG 60 +echo "[startJmeter]脚本路径：${PATH_JMETER_HOME}${s}"
66 #${PATH_JMETER_HOME}/bin/jmeter -n -t ${PATH_JMETER_HOME}${s} -l ${PATH_JMETER_LOG}/jmeter.jtl -j ${PATH_JMETER_LOG}/jmeterRun.log -X > ${PATH_JMETER_LOG}/runtime.log & 61 #${PATH_JMETER_HOME}/bin/jmeter -n -t ${PATH_JMETER_HOME}${s} -l ${PATH_JMETER_LOG}/jmeter.jtl -j ${PATH_JMETER_LOG}/jmeterRun.log -X > ${PATH_JMETER_LOG}/runtime.log &
67 -${PATH_JMETER_HOME}/bin/jmeter -n -t ${PATH_JMETER_HOME}${s} -l /dev/null -j ${PATH_JMETER_LOG}/jmeterRun.log -X > ${PATH_SHELL_LOG} & 62 +${PATH_JMETER_HOME}/bin/jmeter -n -t ${PATH_JMETER_HOME}${s} -l /dev/null -j ${PATH_JMETER_LOG}/jmeterRun.log -X > ${PATH_JMETER_LOG}/runtime.log &
68 } 63 }
69 function stopJmeter(){ 64 function stopJmeter(){
70 eval $CMD_KILL_JMETER 65 eval $CMD_KILL_JMETER
@@ -87,7 +82,7 @@ git reset --hard origin/master @@ -87,7 +82,7 @@ git reset --hard origin/master
87 git pull 82 git pull
88 } 83 }
89 function modifyHosts(){ 84 function modifyHosts(){
90 -echo "[modifyHosts]HOSTS：127.0.0.1 localhost\n::1 localhost\n$IP $HOST_NAME\n$e" >> $PATH_SHELL_LOG 85 +echo "[modifyHosts]HOSTS：127.0.0.1 localhost\n::1 localhost\n$IP $HOST_NAME\n$e"
91 echo -e "127.0.0.1 localhost\n::1 localhost\n$IP $HOST_NAME\n$e" > /etc/hosts 86 echo -e "127.0.0.1 localhost\n::1 localhost\n$IP $HOST_NAME\n$e" > /etc/hosts
92 } 87 }
93 function syncSystemTime(){ 88 function syncSystemTime(){
@@ -95,7 +90,7 @@ eval $CMD_SYNC_SYSTEMTIME @@ -95,7 +90,7 @@ eval $CMD_SYNC_SYSTEMTIME
95 } 90 }
96 function runJmeter(){ 91 function runJmeter(){
97 START_TIME=$(date) 92 START_TIME=$(date)
98 -echo "[START][$START_TIME]-----------------------------" >> $PATH_SHELL_LOG 93 +echo "[START][$START_TIME]-----------------------------"
99 stopJmeter 94 stopJmeter
100 clearJmeterLogs 95 clearJmeterLogs
101 modifyHosts 96 modifyHosts
@@ -105,7 +100,7 @@ restartMonitor @@ -105,7 +100,7 @@ restartMonitor
105 syncSystemTime 100 syncSystemTime
106 101
107 startJmeter 102 startJmeter
108 -echo "" >> $PATH_SHELL_LOG 103 +echo "[Now Start!]"
109 } 104 }
110 if [ ! $c ];then 105 if [ ! $c ];then
111 if [ ! $s ];then 106 if [ ! $s ];then
@@ -117,5 +112,5 @@ else @@ -117,5 +112,5 @@ else
117 stopJmeter 112 stopJmeter
118 stopMonitor 113 stopMonitor
119 END_TIME=$(date) 114 END_TIME=$(date)
120 -echo "[STOPPED][$END_TIME]-----------------------------" >> $PATH_SHELL_LOG 115 +echo "[STOPPED][$END_TIME]-----------------------------"
121 fi 116 fi