You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2016/02/19 17:17:34 UTC
svn commit: r1731269 - in /httpd/test/mod_h2/trunk: Makefile.am
conf/httpd.conf conf/sites/test.example.org.conf test/test_proxy.sh
Author: icing
Date: Fri Feb 19 16:17:34 2016
New Revision: 1731269
URL: http://svn.apache.org/viewvc?rev=1731269&view=rev
Log:
h2proxy load tests
Modified:
httpd/test/mod_h2/trunk/Makefile.am
httpd/test/mod_h2/trunk/conf/httpd.conf
httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf
httpd/test/mod_h2/trunk/test/test_proxy.sh
Modified: httpd/test/mod_h2/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/Makefile.am?rev=1731269&r1=1731268&r2=1731269&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/Makefile.am Fri Feb 19 16:17:34 2016
@@ -122,6 +122,11 @@ test-proxy: $(MH2FUZZ) $(SERVER_DIR)/.te
@rm -rf $(GEN)/tmp
@mkdir -p $(GEN)/tmp
$(TESTRUN) test/test_proxy.sh test $(HTTP_PORT) $(HTTPS_PORT) $(HOST_NAME) $(HOST_NAME_2) $(HOST_SER_NAME)
+
+test-ser: $(MH2FUZZ) $(SERVER_DIR)/.test-setup
+ @rm -rf $(GEN)/tmp
+ @mkdir -p $(GEN)/tmp
+ $(TESTRUN) test/test_ser.sh test $(HTTP_PORT) $(HTTPS_PORT) $(HOST_NAME) $(HOST_NAME_2) $(HOST_SER_NAME)
test: test-gets test-proxy fuzz
@@ -141,12 +146,20 @@ $(GEN)/load-urls-2.txt: test/load-urls-1
@mkdir -p $(GEN)/tmp
@sed -e "s,SUBST_AUTH_SUBST,http://$(HTTP_AUTH)," < test/load-urls-1.txt >$(GEN)/load-urls-2.txt
+$(GEN)/load-proxy-urls-1.txt: test/load-urls-1.txt
+ @mkdir -p $(GEN)/tmp
+ @sed -e "s,SUBST_AUTH_SUBST,http://$(HTTP_AUTH)/proxy," < test/load-urls-1.txt >$(GEN)/load-proxy-urls-1.txt
+
+$(GEN)/load-h2proxy-urls-1.txt: test/load-urls-1.txt
+ @mkdir -p $(GEN)/tmp
+ @sed -e "s,SUBST_AUTH_SUBST,http://$(HTTP_AUTH)/h2proxy," < test/load-urls-1.txt >$(GEN)/load-h2proxy-urls-1.txt
+
MAX_STREAMS = 100
h2load: \
$(SERVER_DIR)/.test-setup \
$(GEN)/load-urls-1.txt
- $(H2LOAD) -c 100 -t 10 -n 100000 -m $(MAX_STREAMS) https://$(HTTPS_AUTH)/index.html
+ $(H2LOAD) -c 100 -t 10 -n 100000 -m $(MAX_STREAMS) https://$(HTTPS_AUTH)/index2.html
$(H2LOAD) -i $(GEN)/load-urls-1.txt -n 200000 -t 1 -m $(MAX_STREAMS) -c 8
$(H2LOAD) -i $(GEN)/load-urls-1.txt -n 200000 -t 2 -m $(MAX_STREAMS) -c 8
$(H2LOAD) -i $(GEN)/load-urls-1.txt -n 200000 -t 3 -m $(MAX_STREAMS) -c 8
@@ -161,7 +174,7 @@ h2load: \
h2cload: \
$(SERVER_DIR)/.test-setup \
$(GEN)/load-h2c-urls-1.txt
- $(H2LOAD) -c 100 -t 10 -n 100000 -m $(MAX_STREAMS) http://$(HTTP_AUTH)/index.html
+ $(H2LOAD) -c 100 -t 10 -n 100000 -m $(MAX_STREAMS) http://$(HTTP_AUTH)/index2.html
$(H2LOAD) -i $(GEN)/load-h2c-urls-1.txt -n 200000 -t 1 -m $(MAX_STREAMS) -c 8
$(H2LOAD) -i $(GEN)/load-h2c-urls-1.txt -n 200000 -t 2 -m $(MAX_STREAMS) -c 8
$(H2LOAD) -i $(GEN)/load-h2c-urls-1.txt -n 200000 -t 3 -m $(MAX_STREAMS) -c 8
@@ -171,6 +184,32 @@ h2cload: \
$(H2LOAD) -i $(GEN)/load-h2c-urls-1.txt -n 200000 -t 7 -m $(MAX_STREAMS) -c 8
$(H2LOAD) -i $(GEN)/load-h2c-urls-1.txt -n 200000 -t 8 -m $(MAX_STREAMS) -c 8
+proxyload: \
+ $(SERVER_DIR)/.test-setup \
+ $(GEN)/load-proxy-urls-1.txt
+ $(H2LOAD) -c 50 -t 10 -n 100000 -m $(MAX_STREAMS) http://$(HTTP_AUTH)/proxy/index2.html
+ $(H2LOAD) -i $(GEN)/load-proxy-urls-1.txt -n 200000 -t 1 -m $(MAX_STREAMS) -c 8
+ $(H2LOAD) -i $(GEN)/load-proxy-urls-1.txt -n 200000 -t 2 -m $(MAX_STREAMS) -c 8
+ $(H2LOAD) -i $(GEN)/load-proxy-urls-1.txt -n 200000 -t 3 -m $(MAX_STREAMS) -c 8
+ $(H2LOAD) -i $(GEN)/load-proxy-urls-1.txt -n 200000 -t 4 -m $(MAX_STREAMS) -c 8
+ $(H2LOAD) -i $(GEN)/load-proxy-urls-1.txt -n 200000 -t 5 -m $(MAX_STREAMS) -c 8
+ $(H2LOAD) -i $(GEN)/load-proxy-urls-1.txt -n 200000 -t 6 -m $(MAX_STREAMS) -c 8
+ $(H2LOAD) -i $(GEN)/load-proxy-urls-1.txt -n 200000 -t 7 -m $(MAX_STREAMS) -c 8
+ $(H2LOAD) -i $(GEN)/load-proxy-urls-1.txt -n 200000 -t 8 -m $(MAX_STREAMS) -c 8
+
+h2proxyload: \
+ $(SERVER_DIR)/.test-setup \
+ $(GEN)/load-h2proxy-urls-1.txt
+ $(H2LOAD) -c 50 -t 10 -n 100000 -m $(MAX_STREAMS) http://$(HTTP_AUTH)/h2proxy/index2.html
+ $(H2LOAD) -i $(GEN)/load-h2proxy-urls-1.txt -n 200000 -t 1 -m $(MAX_STREAMS) -c 8
+ $(H2LOAD) -i $(GEN)/load-h2proxy-urls-1.txt -n 200000 -t 2 -m $(MAX_STREAMS) -c 8
+ $(H2LOAD) -i $(GEN)/load-h2proxy-urls-1.txt -n 200000 -t 3 -m $(MAX_STREAMS) -c 8
+ $(H2LOAD) -i $(GEN)/load-h2proxy-urls-1.txt -n 200000 -t 4 -m $(MAX_STREAMS) -c 8
+ $(H2LOAD) -i $(GEN)/load-h2proxy-urls-1.txt -n 200000 -t 5 -m $(MAX_STREAMS) -c 8
+ $(H2LOAD) -i $(GEN)/load-h2proxy-urls-1.txt -n 200000 -t 6 -m $(MAX_STREAMS) -c 8
+ $(H2LOAD) -i $(GEN)/load-h2proxy-urls-1.txt -n 200000 -t 7 -m $(MAX_STREAMS) -c 8
+ $(H2LOAD) -i $(GEN)/load-h2proxy-urls-1.txt -n 200000 -t 8 -m $(MAX_STREAMS) -c 8
+
h2tx: \
$(SERVER_DIR)/.test-setup \
$(GEN)/load-urls-1.txt
Modified: httpd/test/mod_h2/trunk/conf/httpd.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/httpd.conf?rev=1731269&r1=1731268&r2=1731269&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/httpd.conf (original)
+++ httpd/test/mod_h2/trunk/conf/httpd.conf Fri Feb 19 16:17:34 2016
@@ -136,7 +136,8 @@ DocumentRoot "SUBST_SERVER_ROOT_SUBST/ht
</IfModule>
<IfModule proxy_http2_module>
- LogLevel proxy_http2:info
+ #LogLevel proxy:debug
+ LogLevel proxy_http2:debug
ProxyVia full
</IfModule>
Modified: httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf?rev=1731269&r1=1731268&r2=1731269&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf (original)
+++ httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf Fri Feb 19 16:17:34 2016
@@ -22,10 +22,10 @@
<IfModule proxy_http2_module>
<Proxy "balancer://h2-local">
- BalancerMember "h2://test.example.org:SUBST_PORT_HTTPS_SUBST"
+ BalancerMember "h2://test2.example.org:SUBST_PORT_HTTPS_SUBST"
</Proxy>
<Proxy "balancer://h2c-local">
- BalancerMember "h2c://test.example.org:SUBST_PORT_HTTP_SUBST"
+ BalancerMember "h2c://test2.example.org:SUBST_PORT_HTTP_SUBST"
</Proxy>
</IfModule>
Modified: httpd/test/mod_h2/trunk/test/test_proxy.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_proxy.sh?rev=1731269&r1=1731268&r2=1731269&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_proxy.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_proxy.sh Fri Feb 19 16:17:34 2016
@@ -33,14 +33,15 @@ MH2FUZZ=mh2fuzz/mh2fuzz
source $(dirname $0)/test_common.sh
if min_version 2.5.0; then
+
$SHELL "$TEST_DIR"/test_nghttp_get.sh $HTTPS_AUTH/h2cproxy &&
$SHELL "$TEST_DIR"/test_nghttp_post.sh $HTTPS_AUTH/h2cproxy &&
$SHELL "$TEST_DIR"/test_curl_get.sh $HTTPS_AUTH/h2cproxy &&
-$SHELL "$TEST_DIR"/test_curl_post.sh $HTTPS_AUTH/h2cproxy
-
+$SHELL "$TEST_DIR"/test_curl_post.sh $HTTPS_AUTH/h2cproxy &&
$SHELL "$TEST_DIR"/test_nghttp_get.sh $HTTPS_AUTH/h2proxy &&
$SHELL "$TEST_DIR"/test_nghttp_post.sh $HTTPS_AUTH/h2proxy &&
$SHELL "$TEST_DIR"/test_curl_get.sh $HTTPS_AUTH/h2proxy &&
-$SHELL "$TEST_DIR"/test_curl_post.sh $HTTPS_AUTH/h2proxy
+$SHELL "$TEST_DIR"/test_curl_post.sh $HTTPS_AUTH/h2proxy &&
+:
fi