Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
560d2744
Commit
560d2744
authored
Aug 01, 2017
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
retire s_req - it is identical to client_req
Merges #2381
parent
465b8b8c
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
6 additions
and
13 deletions
+6
-13
cache_req_fsm.c
bin/varnishd/cache/cache_req_fsm.c
+0
-1
main.vsc
bin/varnishd/main.vsc
+0
-4
b00000.vtc
bin/varnishtest/tests/b00000.vtc
+0
-1
b00001.vtc
bin/varnishtest/tests/b00001.vtc
+0
-1
b00002.vtc
bin/varnishtest/tests/b00002.vtc
+0
-1
b00003.vtc
bin/varnishtest/tests/b00003.vtc
+0
-1
c00020.vtc
bin/varnishtest/tests/c00020.vtc
+0
-1
r01857.vtc
bin/varnishtest/tests/r01857.vtc
+0
-1
v00042.vtc
bin/varnishtest/tests/v00042.vtc
+1
-1
v00043.vtc
bin/varnishtest/tests/v00043.vtc
+1
-1
changes.rst
doc/changes.rst
+4
-0
No files found.
bin/varnishd/cache/cache_req_fsm.c
View file @
560d2744
...
@@ -79,7 +79,6 @@ cnt_transport(struct worker *wrk, struct req *req)
...
@@ -79,7 +79,6 @@ cnt_transport(struct worker *wrk, struct req *req)
}
}
wrk
->
stats
->
client_req
++
;
wrk
->
stats
->
client_req
++
;
wrk
->
stats
->
s_req
++
;
AZ
(
req
->
err_code
);
AZ
(
req
->
err_code
);
req
->
ws_req
=
WS_Snapshot
(
req
->
ws
);
req
->
ws_req
=
WS_Snapshot
(
req
->
ws
);
...
...
bin/varnishd/main.vsc
View file @
560d2744
...
@@ -305,10 +305,6 @@
...
@@ -305,10 +305,6 @@
:oneliner: Total sessions seen
:oneliner: Total sessions seen
.. varnish_vsc:: s_req
:oneliner: Total requests seen
.. varnish_vsc:: s_pipe
.. varnish_vsc:: s_pipe
:oneliner: Total pipe sessions seen
:oneliner: Total pipe sessions seen
...
...
bin/varnishtest/tests/b00000.vtc
View file @
560d2744
...
@@ -30,6 +30,5 @@ varnish v1 -expect sess_conn == 1
...
@@ -30,6 +30,5 @@ varnish v1 -expect sess_conn == 1
varnish v1 -expect client_req == 1
varnish v1 -expect client_req == 1
varnish v1 -expect cache_miss == 1
varnish v1 -expect cache_miss == 1
varnish v1 -expect s_sess == 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_bodybytes == 7
varnish v1 -expect s_resp_hdrbytes == 178
varnish v1 -expect s_resp_hdrbytes == 178
bin/varnishtest/tests/b00001.vtc
View file @
560d2744
...
@@ -34,5 +34,4 @@ varnish v1 -expect n_object == 0
...
@@ -34,5 +34,4 @@ varnish v1 -expect n_object == 0
varnish v1 -expect sess_conn == 1
varnish v1 -expect sess_conn == 1
varnish v1 -expect client_req == 1
varnish v1 -expect client_req == 1
varnish v1 -expect s_sess == 1
varnish v1 -expect s_sess == 1
varnish v1 -expect s_req == 1
varnish v1 -expect s_pipe == 1
varnish v1 -expect s_pipe == 1
bin/varnishtest/tests/b00002.vtc
View file @
560d2744
...
@@ -39,7 +39,6 @@ varnish v1 -expect SMA.Transient.g_alloc == 0
...
@@ -39,7 +39,6 @@ varnish v1 -expect SMA.Transient.g_alloc == 0
varnish v1 -expect sess_conn == 1
varnish v1 -expect sess_conn == 1
varnish v1 -expect client_req == 1
varnish v1 -expect client_req == 1
varnish v1 -expect s_sess == 1
varnish v1 -expect s_sess == 1
varnish v1 -expect s_req == 1
varnish v1 -expect s_pass == 1
varnish v1 -expect s_pass == 1
logexpect l1 -wait
logexpect l1 -wait
bin/varnishtest/tests/b00003.vtc
View file @
560d2744
...
@@ -29,5 +29,4 @@ varnish v1 -expect cache_hit == 1
...
@@ -29,5 +29,4 @@ varnish v1 -expect cache_hit == 1
varnish v1 -expect cache_miss == 1
varnish v1 -expect cache_miss == 1
varnish v1 -expect client_req == 2
varnish v1 -expect client_req == 2
varnish v1 -expect s_sess == 2
varnish v1 -expect s_sess == 2
varnish v1 -expect s_req == 2
varnish v1 -expect s_fetch == 1
varnish v1 -expect s_fetch == 1
bin/varnishtest/tests/c00020.vtc
View file @
560d2744
...
@@ -69,5 +69,4 @@ varnish v1 -expect cache_hit == 3
...
@@ -69,5 +69,4 @@ varnish v1 -expect cache_hit == 3
varnish v1 -expect cache_miss == 3
varnish v1 -expect cache_miss == 3
varnish v1 -expect client_req == 6
varnish v1 -expect client_req == 6
varnish v1 -expect s_sess == 3
varnish v1 -expect s_sess == 3
varnish v1 -expect s_req == 6
varnish v1 -expect s_fetch == 3
varnish v1 -expect s_fetch == 3
bin/varnishtest/tests/r01857.vtc
View file @
560d2744
...
@@ -28,5 +28,4 @@ varnish v1 -expect cache_hit == 1
...
@@ -28,5 +28,4 @@ varnish v1 -expect cache_hit == 1
varnish v1 -expect cache_miss == 1
varnish v1 -expect cache_miss == 1
varnish v1 -expect client_req == 2
varnish v1 -expect client_req == 2
varnish v1 -expect s_sess == 1
varnish v1 -expect s_sess == 1
varnish v1 -expect s_req == 2
varnish v1 -expect s_fetch == 1
varnish v1 -expect s_fetch == 1
bin/varnishtest/tests/v00042.vtc
View file @
560d2744
...
@@ -72,4 +72,4 @@ client c1 {
...
@@ -72,4 +72,4 @@ client c1 {
expect resp.http.o1 == "/b0"
expect resp.http.o1 == "/b0"
} -run
} -run
varnish v1 -expect
s
_req == 2
varnish v1 -expect
client
_req == 2
bin/varnishtest/tests/v00043.vtc
View file @
560d2744
...
@@ -74,4 +74,4 @@ client c1 {
...
@@ -74,4 +74,4 @@ client c1 {
expect resp.http.o1 == "/b0"
expect resp.http.o1 == "/b0"
} -run
} -run
varnish v1 -expect
s
_req == 2
varnish v1 -expect
client
_req == 2
doc/changes.rst
View file @
560d2744
...
@@ -15,6 +15,10 @@ Varnish Cache Trunk (ongoing)
...
@@ -15,6 +15,10 @@ Varnish Cache Trunk (ongoing)
* varnishd honors vcl_path (#2342)
* 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)
Varnish Cache 5.1.2 (2017-04-07)
================================
================================
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment