[master] 560d274 retire s_req - it is identical to client_req

Nils Goroll nils.goroll at uplex.de
Tue Aug 8 11:56:06 CEST 2017


commit 560d2744f08169cc6e7b1ba3aa1908f76614a0be
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Aug 1 15:06:41 2017 +0200

    retire s_req - it is identical to client_req
    
    Merges #2381

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 1bbc552..bd3e4af 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -79,7 +79,6 @@ cnt_transport(struct worker *wrk, struct req *req)
 	}
 
 	wrk->stats->client_req++;
-	wrk->stats->s_req++;
 
 	AZ(req->err_code);
 	req->ws_req = WS_Snapshot(req->ws);
diff --git a/bin/varnishd/main.vsc b/bin/varnishd/main.vsc
index 8292c1e..dd53b9e 100644
--- a/bin/varnishd/main.vsc
+++ b/bin/varnishd/main.vsc
@@ -305,10 +305,6 @@
 	:oneliner:	Total sessions seen
 
 
-.. varnish_vsc:: s_req
-	:oneliner:	Total requests seen
-
-
 .. varnish_vsc:: s_pipe
 	:oneliner:	Total pipe sessions seen
 
diff --git a/bin/varnishtest/tests/b00000.vtc b/bin/varnishtest/tests/b00000.vtc
index c33038a..7937df8 100644
--- a/bin/varnishtest/tests/b00000.vtc
+++ b/bin/varnishtest/tests/b00000.vtc
@@ -30,6 +30,5 @@ varnish v1 -expect sess_conn == 1
 varnish v1 -expect client_req == 1
 varnish v1 -expect cache_miss == 1
 varnish v1 -expect s_sess == 1
-varnish v1 -expect s_req == 1
 varnish v1 -expect s_resp_bodybytes == 7
 varnish v1 -expect s_resp_hdrbytes == 178
diff --git a/bin/varnishtest/tests/b00001.vtc b/bin/varnishtest/tests/b00001.vtc
index b45ddb5..95dc08d 100644
--- a/bin/varnishtest/tests/b00001.vtc
+++ b/bin/varnishtest/tests/b00001.vtc
@@ -34,5 +34,4 @@ varnish v1 -expect n_object == 0
 varnish v1 -expect sess_conn == 1
 varnish v1 -expect client_req == 1
 varnish v1 -expect s_sess == 1
-varnish v1 -expect s_req == 1
 varnish v1 -expect s_pipe == 1
diff --git a/bin/varnishtest/tests/b00002.vtc b/bin/varnishtest/tests/b00002.vtc
index 4426904..d0f3cc6 100644
--- a/bin/varnishtest/tests/b00002.vtc
+++ b/bin/varnishtest/tests/b00002.vtc
@@ -39,7 +39,6 @@ varnish v1 -expect SMA.Transient.g_alloc == 0
 varnish v1 -expect sess_conn == 1
 varnish v1 -expect client_req == 1
 varnish v1 -expect s_sess == 1
-varnish v1 -expect s_req == 1
 varnish v1 -expect s_pass == 1
 
 logexpect l1 -wait
diff --git a/bin/varnishtest/tests/b00003.vtc b/bin/varnishtest/tests/b00003.vtc
index 77b6972..435d3ef 100644
--- a/bin/varnishtest/tests/b00003.vtc
+++ b/bin/varnishtest/tests/b00003.vtc
@@ -29,5 +29,4 @@ varnish v1 -expect cache_hit == 1
 varnish v1 -expect cache_miss == 1
 varnish v1 -expect client_req == 2
 varnish v1 -expect s_sess == 2
-varnish v1 -expect s_req == 2
 varnish v1 -expect s_fetch == 1
diff --git a/bin/varnishtest/tests/c00020.vtc b/bin/varnishtest/tests/c00020.vtc
index 91fcd12..efcfe24 100644
--- a/bin/varnishtest/tests/c00020.vtc
+++ b/bin/varnishtest/tests/c00020.vtc
@@ -69,5 +69,4 @@ varnish v1 -expect cache_hit == 3
 varnish v1 -expect cache_miss == 3
 varnish v1 -expect client_req == 6
 varnish v1 -expect s_sess == 3
-varnish v1 -expect s_req == 6
 varnish v1 -expect s_fetch == 3
diff --git a/bin/varnishtest/tests/r01857.vtc b/bin/varnishtest/tests/r01857.vtc
index 8bb1aa4..5686be8 100644
--- a/bin/varnishtest/tests/r01857.vtc
+++ b/bin/varnishtest/tests/r01857.vtc
@@ -28,5 +28,4 @@ varnish v1 -expect cache_hit == 1
 varnish v1 -expect cache_miss == 1
 varnish v1 -expect client_req == 2
 varnish v1 -expect s_sess == 1
-varnish v1 -expect s_req == 2
 varnish v1 -expect s_fetch == 1
diff --git a/bin/varnishtest/tests/v00042.vtc b/bin/varnishtest/tests/v00042.vtc
index e7901b1..54dccca 100644
--- a/bin/varnishtest/tests/v00042.vtc
+++ b/bin/varnishtest/tests/v00042.vtc
@@ -72,4 +72,4 @@ client c1 {
 	expect resp.http.o1 == "/b0"
 } -run
 
-varnish v1 -expect s_req == 2
+varnish v1 -expect client_req == 2
diff --git a/bin/varnishtest/tests/v00043.vtc b/bin/varnishtest/tests/v00043.vtc
index 7e7a4f9..9aaae1a 100644
--- a/bin/varnishtest/tests/v00043.vtc
+++ b/bin/varnishtest/tests/v00043.vtc
@@ -74,4 +74,4 @@ client c1 {
 	expect resp.http.o1 == "/b0"
 } -run
 
-varnish v1 -expect s_req == 2
+varnish v1 -expect client_req == 2
diff --git a/doc/changes.rst b/doc/changes.rst
index a40d0a3..fe16406 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -15,6 +15,10 @@ Varnish Cache Trunk (ongoing)
 
 * varnishd honors vcl_path (#2342)
 
+* The ``MAIN.s_req`` statistic has been removed, as tt was identical to
+  ``MAIN.client_req``. VSM consumers should be changed to use the
+  latter if necessary.
+
 ================================
 Varnish Cache 5.1.2 (2017-04-07)
 ================================



More information about the varnish-commit mailing list