提交: e4a1350be2b266142dbb63ce3f30d019d1aae42c - ultramonkey-l7-v3 (git)

UltraMonkey-L7 V3(multi-thread implementation)

Commit MetaInfo

• 修訂: e4a1350be2b266142dbb63ce3f30d019d1aae42c (tree)
• 時間: 2010-10-08 17:38:45
• 作者: 6638678 <6638678@1ed6...>
• Commiter: 6638678

Log Message

bug fix

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

Change Summary

• modified: test/script/l7directord/l7directord-1-2-44-2.sh
• modified: test/script/l7directord/l7directord-1-2-48-2.sh
• modified: test/script/l7directord/l7directord-5-3-5.sh
• modified: test/script/l7directord/materials/l7directord-help.txt
• modified: test/script/l7vsadm/l7vsadm-1-1-2.sh
• modified: test/script/l7vsadm/l7vsadm-4-1-20.sh
• modified: test/script/virtualservice/virtualservice-1.sh
• modified: test/script/virtualservice/virtualservice-12.sh
• modified: test/script/virtualservice/virtualservice-26.sh
• modified: test/script/virtualservice/virtualservice-27.sh

差異

--- a/test/script/l7directord/l7directord-1-2-44-2.sh
+++ b/test/script/l7directord/l7directord-1-2-44-2.sh
@@ -3,7 +3,7 @@
 \cp ./materials/l7directord-1-2-44-l7directord.cf ${L7DIRECTORD_CONF_DIR}/l7directord.cf
 
 #test l7directord config file
-RET=`$L7DIRECTORD -t"`
+RET=`$L7DIRECTORD -t`
 if [ $? -ne 0 ]
 then
         echo "Test failed: $L7DIRECTORD -t"

--- a/test/script/l7directord/l7directord-1-2-48-2.sh
+++ b/test/script/l7directord/l7directord-1-2-48-2.sh
@@ -3,7 +3,7 @@
 \cp ./materials/l7directord-1-2-48-l7directord.cf ${L7DIRECTORD_CONF_DIR}/specified.cf
 
 #test l7directord config file
-RET=`$L7DIRECTORD -t ${L7DIRECTORD_CONF_DIR}/specified.cf"`
+RET=`$L7DIRECTORD -t ${L7DIRECTORD_CONF_DIR}/specified.cf`
 if [ $? -ne 0 ]
 then
         echo "Test failed: $L7DIRECTORD -t ${L7DIRECTORD_CONF_DIR}/specified.cf"

--- a/test/script/l7directord/l7directord-5-3-5.sh
+++ b/test/script/l7directord/l7directord-5-3-5.sh
@@ -31,7 +31,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7directord.log | grep "\[ERR0303\] Failed to command .$L7VSADM -A -t 127.0.0.1:50001 -m ip --foo -s wrr -u 0 -b 0.0.0.0:0 -Q 0 -q 0 2>&1. with return: 65280"`
+RET=`cat ${L7VS_LOG_DIR}/l7directord.log | grep "\[ERR0303\] Failed to command ./usr/sbin/l7vsadm -A -t 127.0.0.1:50001 -m ip --foo -s wrr -u 0 -b 0.0.0.0:0  -Q 0 -q 0 2>&1. with return: 65280"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7directord.log"
@@ -45,35 +45,4 @@ then
         exit 1
 fi
 
-
-##########
-RET=`cat ${L7VS_LOG_DIR}/l7directord.log | grep "\[ERR0303\] Failed to command .$L7VSADM -A -t 127.0.0.1:50002 -m sslid -foo -s lc -u 0 -b 0.0.0.0:0 -Q 0 -q 0 2>&1' with return: 65280"`
-if [ -z "${RET}" ]
-then
-        echo "Test failed: cat ${L7VS_LOG_DIR}/l7directord.log"
-        exit 1
-fi
-
-RET=`cat ${L7VS_LOG_DIR}/l7directord.log | grep "\[ERR0201\] Failed to add virtual service to l7vsd: .127.0.0.1:50002 sslid ', output: .PARSE ERROR: protocol module argument error(--proto-module): Option error.'"`
-if [ -z "${RET}" ]
-then
-        echo "Test failed: cat ${L7VS_LOG_DIR}/l7directord.log"
-        exit 1
-fi
-
-###########33
-RET=`cat ${L7VS_LOG_DIR}/l7directord.log | grep "\[ERR0303\] Failed to command .$L7VSADM -A -t 127.0.0.1:50003 -m sessionless --foo -s rr -u 0 -b 0.0.0.0:0 -Q 0 -q 0 2>&1' with return: 65280"`
-if [ -z "${RET}" ]
-then
-        echo "Test failed: cat ${L7VS_LOG_DIR}/l7directord.log"
-        exit 1
-fi
-
-RET=`cat ${L7VS_LOG_DIR}/l7directord.log | grep "\[ERR0201\] Failed to add virtual service to l7vsd: .127.0.0.1:50003 sessionless ', output: .PARSE ERROR: protocol module argument error(--proto-module): Option error.'"`
-if [ -z "${RET}" ]
-then
-        echo "Test failed: cat ${L7VS_LOG_DIR}/l7directord.log"
-        exit 1
-fi
-
 exit 0

--- a/test/script/l7directord/materials/l7directord-help.txt
+++ b/test/script/l7directord/materials/l7directord-help.txt
@@ -42,7 +42,7 @@ OOPPTTIIOONNSS
            This is the name for the configuration as specified in the file
            //eettcc//hhaa..dd//ccoonnff//_c_o_n_f_i_g_u_r_a_t_i_o_n
 
-       --dd  Don’t start as daemon. Useful for debugging.
+       --dd  Don't start as daemon. Useful for debugging.
 
        --hh  Help. Print user manual of l7directord.
 
@@ -158,7 +158,7 @@ SSYYNNTTAAXX
 
        llooggffiillee == ""_/_p_a_t_h_/_t_o_/_l_o_g_f_i_l_e""|syslog_facility
            An alternative logfile might be specified with this directive. If
-           the logfile does not have a leading ’/’, it is assumed to be a
+           the logfile does not have a leading '/', it is assumed to be a
            _s_y_s_l_o_g(3) facility name.
 
            The default is to log directly to the file
@@ -210,7 +210,7 @@ SSYYNNTTAAXX
            Indicates the module parameter of ll77ddiirreeccttoorrdd. Here pprroottoo--mmoodduullee
            denotes the protocol module name (For example, pfilter). mmoodduullee--
            aarrggss denotes the arguments for the protocol module (For example,
-           --pattern-match ’*.html*’).  mmoodduullee--aarrggss is optional only when set
+           --pattern-match '*.html*').  mmoodduullee--aarrggss is optional only when set
            sseessssiioonnlleessss, iipp and sssslliidd module to pprroottoo--mmoodduullee.  The last
            argument is optional (For example, --reschedule).
 
@@ -292,8 +292,8 @@ SSYYNNTTAAXX
            regexp may be overridden by an optional per real-server based
            receive regexp.
 
-           For a DNS check this should be any one the A record’s addresses or
-           any one of the PTR record’s names.
+           For a DNS check this should be any one the A record's addresses or
+           any one of the PTR record's names.
 
            For a MySQL check, the receive setting is not used.
 
@@ -346,15 +346,15 @@ SSYYNNTTAAXX
 
        rreeaallddoowwnnccaallllbbaacckk == ""_/_p_a_t_h_/_t_o_/_r_e_a_l_d_o_w_n_c_a_l_l_b_a_c_k""
            If this directive is defined, ll77ddiirreeccttoorrdd automatically calls the
-           executable _/_p_a_t_h_/_t_o_/_r_e_a_l_d_o_w_n_c_a_l_l_b_a_c_k after a real server’s status
+           executable _/_p_a_t_h_/_t_o_/_r_e_a_l_d_o_w_n_c_a_l_l_b_a_c_k after a real server's status
            changes to down. The first argument to the realdowncallback is the
-           real server’s IP-address and port (ip_address:portnumber).
+           real server's IP-address and port (ip_address:portnumber).
 
        rreeaallrreeccoovveerrccaallllbbaacckk == ""_/_p_a_t_h_/_t_o_/_r_e_a_l_r_e_c_o_v_e_r_c_a_l_l_b_a_c_k""
            If this directive is defined, ll77ddiirreeccttoorrdd automatically calls the
-           executable _/_p_a_t_h_/_t_o_/_r_e_a_l_r_e_c_o_v_e_r_c_a_l_l_b_a_c_k after a real server’s
+           executable _/_p_a_t_h_/_t_o_/_r_e_a_l_r_e_c_o_v_e_r_c_a_l_l_b_a_c_k after a real server's
            status changes to up. The first argument to the realrecovercallback
-           is the real server’s IP-address and port (ip_address:portnumber).
+           is the real server's IP-address and port (ip_address:portnumber).
 
        ccuussttoommcchheecckk == ""_c_u_s_t_o_m _c_h_e_c_k _c_o_m_m_a_n_d""
            If this directive is defined and set cchheecckkttyyppee to custom,
@@ -450,4 +450,4 @@ AAUUTTHHOORRSS
 
 
 
-perl v5.10.1                      2010-10-07                    L7DIRECTORD(1)
+perl v5.10.1                      2010-10-08                    L7DIRECTORD(1)

--- a/test/script/l7vsadm/l7vsadm-1-1-2.sh
+++ b/test/script/l7vsadm/l7vsadm-1-1-2.sh
@@ -23,7 +23,7 @@ then
         exit 1
 fi
 
-if [ $((TIME1 + 4)) -ne $TIME2 ]
+if [ $((TIME1 + 4)) -gt $TIME2 ]
 then
         echo "Test failed: flock -n -x $L7VSADM l7vsadm"
         exit 1

--- a/test/script/l7vsadm/l7vsadm-4-1-20.sh
+++ b/test/script/l7vsadm/l7vsadm-4-1-20.sh
@@ -80,7 +80,7 @@ Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
 TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/' --statistic 0
   Bypass Settings:
-    Sorry Server                  127.0.0.1:50001
+    Sorry Server                  127.0.0.1:50001 Masq
     Max Connection                0
     Sorry Flag                    off
   SSL Settings:

--- a/test/script/virtualservice/virtualservice-1.sh
+++ b/test/script/virtualservice/virtualservice-1.sh
@@ -82,20 +82,20 @@ Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
 TCP localhost:40001 sessionless wrr --sorry-uri '/' --statistic 0
   Bypass Settings:
-    Sorry Server                  localhost:50001
+    Sorry Server                  localhost:50001 Masq
     Max Connection                10
     Sorry Flag                    off
   SSL Settings:
     SSL Config File               none
   Logging Settings:
     Access Log                    on
-    Access Log File               deferaccept,cork,quickackoff,nodelay
+    Access Log File               /var/log/l7vs/l7vsd_conn.log
     Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 12 --ac-rotate-max-filesize 1M
   Socket Settings:
     TCP_DEFER_ACCEPT              enable
     TCP_NODELAY                   enable
     TCP_CORK                      enable
-    TCP_QUICKACK                  enable
+    TCP_QUICKACK                  disable
   Throughput:
     Current Upload / Limit        0.000000 Mbps / 800.000000 Mbps
     Current Download / Limit      0.000000 Mbps / 800.000000 Mbps

--- a/test/script/virtualservice/virtualservice-12.sh
+++ b/test/script/virtualservice/virtualservice-12.sh
@@ -167,7 +167,7 @@ Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
 TCP localhost:40001 ip lc --timeout 3600 --no-reschedule --sorry-uri '/' --statistic 0
   Bypass Settings:
-    Sorry Server                  localhost:50001
+    Sorry Server                  localhost:50001 Masq
     Max Connection                200
     Sorry Flag                    off
   SSL Settings:

--- a/test/script/virtualservice/virtualservice-26.sh
+++ b/test/script/virtualservice/virtualservice-26.sh
@@ -82,7 +82,7 @@ Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
 TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/' --statistic 0
   Bypass Settings:
-    Sorry Server                  127.0.0.1:50001
+    Sorry Server                  127.0.0.1:50001 Masq
     Max Connection                0
     Sorry Flag                    off
   SSL Settings:

--- a/test/script/virtualservice/virtualservice-27.sh
+++ b/test/script/virtualservice/virtualservice-27.sh
@@ -89,7 +89,7 @@ Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
 TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/' --statistic 0
   Bypass Settings:
-    Sorry Server                  127.0.0.1:50001
+    Sorry Server                  127.0.0.1:50001 Masq
     Max Connection                0
     Sorry Flag                    off
   SSL Settings: