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
16df092f
Commit
16df092f
authored
Oct 11, 2018
by
Dag Haavi Finstad
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add ws_client_overflow counter
parent
34725484
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
18 additions
and
0 deletions
+18
-0
VSC_main.vsc
bin/varnishd/VSC_main.vsc
+7
-0
cache_req.c
bin/varnishd/cache/cache_req.c
+5
-0
cache_http2_deliver.c
bin/varnishd/http2/cache_http2_deliver.c
+1
-0
c00070.vtc
bin/varnishtest/tests/c00070.vtc
+1
-0
c00071.vtc
bin/varnishtest/tests/c00071.vtc
+1
-0
r02233.vtc
bin/varnishtest/tests/r02233.vtc
+1
-0
r02589.vtc
bin/varnishtest/tests/r02589.vtc
+1
-0
v00058.vtc
bin/varnishtest/tests/v00058.vtc
+1
-0
No files found.
bin/varnishd/VSC_main.vsc
View file @
16df092f
...
...
@@ -601,6 +601,13 @@
Number of times we ran out of space in workspace_backend.
.. varnish_vsc:: ws_client_overflow
:level: diag
:group: wrk
:oneliner: workspace_client overflows
Number of times we ran out of space in workspace_client.
.. varnish_vsc:: shm_records
:level: diag
:oneliner: SHM records
...
...
bin/varnishd/cache/cache_req.c
View file @
16df092f
...
...
@@ -191,6 +191,8 @@ Req_Rollback(struct req *req)
VCL_TaskLeave
(
req
->
vcl
,
req
->
privs
);
VCL_TaskEnter
(
req
->
vcl
,
req
->
privs
);
HTTP_Copy
(
req
->
http
,
req
->
http0
);
if
(
WS_Overflowed
(
req
->
ws
))
req
->
wrk
->
stats
->
ws_client_overflow
++
;
WS_Reset
(
req
->
ws
,
req
->
ws_req
);
}
...
...
@@ -242,6 +244,9 @@ Req_Cleanup(struct sess *sp, struct worker *wrk, struct req *req)
req
->
hash_ignore_busy
=
0
;
req
->
is_hit
=
0
;
if
(
WS_Overflowed
(
req
->
ws
))
wrk
->
stats
->
ws_client_overflow
++
;
WS_Reset
(
req
->
ws
,
0
);
}
...
...
bin/varnishd/http2/cache_http2_deliver.c
View file @
16df092f
...
...
@@ -273,6 +273,7 @@ h2_deliver(struct req *req, struct boc *boc, int sendbody)
VSB_bcat
(
&
resp
,
r
,
sz
);
}
if
(
VSB_finish
(
&
resp
))
{
WS_MarkOverflow
(
req
->
ws
);
// We ran out of workspace, return minimal 500
VSLb
(
req
->
vsl
,
SLT_Error
,
"workspace_client overflow"
);
VSLb
(
req
->
vsl
,
SLT_RespStatus
,
"500"
);
...
...
bin/varnishtest/tests/c00070.vtc
View file @
16df092f
...
...
@@ -69,3 +69,4 @@ client c1 {
logexpect l2 -wait
varnish v1 -expect client_resp_500 == 1
varnish v1 -expect ws_client_overflow == 2
bin/varnishtest/tests/c00071.vtc
View file @
16df092f
...
...
@@ -48,3 +48,4 @@ client c2 {
varnish v1 -expect client_resp_500 == 2
varnish v1 -expect ws_client_overflow == 2
bin/varnishtest/tests/r02233.vtc
View file @
16df092f
...
...
@@ -29,3 +29,4 @@ client c1 {
logexpect l1 -wait
varnish v1 -expect client_resp_500 == 1
varnish v1 -expect ws_client_overflow == 1
bin/varnishtest/tests/r02589.vtc
View file @
16df092f
...
...
@@ -29,3 +29,4 @@ client c1 {
} -run
varnish v1 -expect client_resp_500 == 1
varnish v1 -expect ws_client_overflow == 1
bin/varnishtest/tests/v00058.vtc
View file @
16df092f
...
...
@@ -166,3 +166,4 @@ client c1 {
} -run
varnish v1 -expect client_resp_500 == 1
varnish v1 -expect ws_client_overflow == 2
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