Commit: aeb10f0808be9bad462610c2977e7f4ed7905e7e - ultramonkey-l7-v3 (git)

UltraMonkey-L7 V3(multi-thread implementation)

Commit MetaInfo

• Révision: aeb10f0808be9bad462610c2977e7f4ed7905e7e (tree)
• l'heure: 2010-11-09 11:51:04
• Auteur: 6638678 <6638678@1ed6...>
• Commiter: 6638678

Message de Log

bug fix.

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel-epoll-cond@10427 1ed66053-1c2d-0410-8867-f7571e6e31d3

Change Summary

• modified: test/script/PT/A/A-4.sh
• modified: test/script/PT/B/B-6-IPv4v4.sh
• modified: test/script/PT/B/B-6-IPv6v4.sh
• modified: test/script/PT/B/B-6-IPv6v6.sh
• modified: test/script/PT/B/B-9-IPv4v4.sh
• modified: test/script/PT/B/B-9-IPv6v4.sh
• modified: test/script/PT/B/B-9-IPv6v6.sh
• modified: test/script/common/stop_um_ps.sh

Modification

--- a/test/script/PT/A/A-4.sh
+++ b/test/script/PT/A/A-4.sh
@@ -14,7 +14,6 @@ usleep 100000
 
 #Check L7VSD Service
 RET=`pgrep l7vsd`
-echo "$RET"
 if [ -z "${RET}" ]
 then
         echo "Test failed: pgrep l7vsd"
@@ -23,7 +22,6 @@ fi
 
 #Check PID file
 RET1=`cat /var/run/l7vsd.pid | grep "$RET"`
-
 if [ -z "${RET1}" ]
 then
         echo "Test failed: cat /var/run/l7vsd.pid | grep \"$RET1\""
@@ -37,6 +35,7 @@ then
         echo "Test failed: $INIT_L7VSD stop"
         exit 1
 fi
+sleep 1
 
 #check L7VSD Stoped
 RET2=`pgrep l7vsd`

--- a/test/script/PT/B/B-6-IPv4v4.sh
+++ b/test/script/PT/B/B-6-IPv4v4.sh
@@ -28,7 +28,7 @@ usleep 100000
 $L7VSADM -A -t $VS:40001 -m sessionless -s rr -u 100 -b $SS:50001 -f 0 -Q 200K -q 200k --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t $VS:40001 -m sessionless -s rr -u 100 -b $SS:50001 -f 0 -Q 200K -q 200k"
+        echo "Test failed: $L7VSADM -A -t $VS:40001 -m sessionless -s rr -u 100 -b $SS:50001 -f 0 -Q 200K -q 200k --tproxy"
         exit 1
 fi
 

--- a/test/script/PT/B/B-6-IPv6v4.sh
+++ b/test/script/PT/B/B-6-IPv6v4.sh
@@ -28,7 +28,7 @@ usleep 100000
 $L7VSADM -A -t $VS:40001 -m sessionless -s rr -u 100 -b $SS:50001 -f 0 -Q 200K -q 200k --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t $VS:40001 -m sessionless -s rr -u 100 -b $SS:50001 -f 0 -Q 200K -q 200k"
+        echo "Test failed: $L7VSADM -A -t $VS:40001 -m sessionless -s rr -u 100 -b $SS:50001 -f 0 -Q 200K -q 200k --tproxy"
         exit 1
 fi
 

--- a/test/script/PT/B/B-6-IPv6v6.sh
+++ b/test/script/PT/B/B-6-IPv6v6.sh
@@ -28,7 +28,7 @@ usleep 100000
 $L7VSADM -A -t $VS:40001 -m sessionless -s rr -u 100 -b $SS:50001 -f 0 -Q 200K -q 200k --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t $VS:40001 -m sessionless -s rr -u 100 -b $SS:50001 -f 0 -Q 200K -q 200k"
+        echo "Test failed: $L7VSADM -A -t $VS:40001 -m sessionless -s rr -u 100 -b $SS:50001 -f 0 -Q 200K -q 200k --tproxy"
         exit 1
 fi
 

--- a/test/script/PT/B/B-9-IPv4v4.sh
+++ b/test/script/PT/B/B-9-IPv4v4.sh
@@ -35,7 +35,7 @@ fi
 $L7VSADM -a -t $VS:40001 -m sessionless -r $RS:50001 --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t $VS:40001 -m sessionless -s rr"
+        echo "Test failed: $L7VSADM -a -t $VS:40001 -m sessionless -r $RS:50001 --tproxy"
         exit 1
 fi
 

--- a/test/script/PT/B/B-9-IPv6v4.sh
+++ b/test/script/PT/B/B-9-IPv6v4.sh
@@ -35,7 +35,7 @@ fi
 $L7VSADM -a -t $VS:40001 -m sessionless -r $RS:50001 --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t $VS:40001 -m sessionless -s rr"
+        echo "Test failed: $L7VSADM -a -t $VS:40001 -m sessionless -r $RS:50001 --tproxy"
         exit 1
 fi
 

--- a/test/script/PT/B/B-9-IPv6v6.sh
+++ b/test/script/PT/B/B-9-IPv6v6.sh
@@ -35,7 +35,7 @@ fi
 $L7VSADM -a -t $VS:40001 -m sessionless -r $RS:50001 --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t $VS:40001 -m sessionless -s rr"
+        echo "Test failed: $L7VSADM -a -t $VS:40001 -m sessionless -r $RS:50001 --tproxy"
         exit 1
 fi
 

--- a/test/script/common/stop_um_ps.sh
+++ b/test/script/common/stop_um_ps.sh
@@ -10,7 +10,7 @@ then
 		LOG_FATAL "Can not stop l7vsd."
 		exit 1
 	fi
-	usleep 500000
+	sleep 1
 	if [ -n "`pgrep l7vsd`" ]
 	then
 		LOG_FATAL "Can not stop l7vsd."
@@ -22,7 +22,7 @@ if [ -n "`pgrep l7directord`" ]
 then
 	${INIT_L7DIRECTORD} stop > /dev/null 2>&1
 	pkill -KILL l7directord > /dev/null 2>&1
-	usleep 500000
+	sleep 1
 	if [ -n "`pgrep l7directord`" ]
 	then
 		LOG_FATAL "Can not stop l7directord."