Skip to content

V
varnish-cache
Unverified Commit 76c9e665 authored by Nils Goroll's avatar Nils Goroll
Browse files
Options

shard: one more log message polish iteration 

Dridi pointed out that there was still a colon missing to conform with
the SLT_Notice documentation in include/tbl/vsl_tags.h
parent d2fd7b60
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 325 additions and 325 deletions
bin/varnishtest/tests/d00015.vtc
View file @ 76c9e665
......@@ -199,75 +199,75 @@ logexpect l1 -v v1 -g raw -d 1 {
expect 0 0 CLI {^Rd vcl.load}
expect 0 0 VCL_Log {^-- invalid replicas$}
expect 0 0 Error {^vmod_directors shard vd: .reconfigure.. invalid replicas argument 0}
expect 0 0 Error {^vmod_directors: shard vd: .reconfigure.. invalid replicas argument 0}
expect 0 0 VCL_Log {^reconfigure failed}
expect 0 0 VCL_Log {^-- no changes - no debug output$}
expect 0 0 VCL_Log {^-- no backends$}
expect 0 0 Error {^vmod_directors shard vd: .reconfigure.. no backends}
expect 0 0 Error {^vmod_directors: shard vd: .reconfigure.. no backends}
expect 0 0 VCL_Log {^reconfigure failed}
expect 0 0 VCL_Log {^-- one backend$}
expect 0 0 Debug {^vmod_directors shard:.*point = f08ad325, host = 0}
expect 0 0 Debug {^vmod_directors: shard:.*point = f08ad325, host = 0}
expect 0 0 VCL_Log {^-- no change - no output$}
expect 0 0 VCL_Log {^-- change, clear, no backends$}
expect 0 0 Error {^vmod_directors shard vd: .reconfigure.. no backends}
expect 0 0 Error {^vmod_directors: shard vd: .reconfigure.. no backends}
expect 0 0 VCL_Log {^reconfigure failed}
expect 0 0 VCL_Log {^-- duplicate add$}
expect 0 0 Notice {^vmod_directors shard vd: backend s1 already exists - skipping$}
expect 0 0 Debug {^vmod_directors shard:.*point = 6e040182, host = 1}
expect 0 0 Debug {^vmod_directors shard:.*point = f08ad325, host = 0}
expect 0 0 Notice {^vmod_directors: shard vd: backend s1 already exists - skipping$}
expect 0 0 Debug {^vmod_directors: shard:.*point = 6e040182, host = 1}
expect 0 0 Debug {^vmod_directors: shard:.*point = f08ad325, host = 0}
expect 0 0 VCL_Log {^-- duplicate add with idents$}
expect 0 0 Notice {^vmod_directors shard vd: backend s1 already exists - skipping}
expect 0 0 Notice {^vmod_directors shard vd: backend s1/s1_1 already exists - skipping}
expect 0 0 Notice {^vmod_directors shard vd: backend s1/s1_2 already exists - skipping}
expect 0 0 Debug {^vmod_directors shard:.*point = 6e040182, host = 3}
expect 0 0 Debug {^vmod_directors shard:.*point = 732c7bbe, host = 2}
expect 0 0 Debug {^vmod_directors shard:.*point = bae80b0b, host = 1}
expect 0 0 Debug {^vmod_directors shard:.*point = f08ad325, host = 0}
expect 0 0 Notice {^vmod_directors: shard vd: backend s1 already exists - skipping}
expect 0 0 Notice {^vmod_directors: shard vd: backend s1/s1_1 already exists - skipping}
expect 0 0 Notice {^vmod_directors: shard vd: backend s1/s1_2 already exists - skipping}
expect 0 0 Debug {^vmod_directors: shard:.*point = 6e040182, host = 3}
expect 0 0 Debug {^vmod_directors: shard:.*point = 732c7bbe, host = 2}
expect 0 0 Debug {^vmod_directors: shard:.*point = bae80b0b, host = 1}
expect 0 0 Debug {^vmod_directors: shard:.*point = f08ad325, host = 0}
expect 0 0 VCL_Log {^-- remove s1_2 specifically$}
expect 0 0 Debug {^vmod_directors shard:.*point = 6e040182, host = 2}
expect 0 0 Debug {^vmod_directors shard:.*point = bae80b0b, host = 1}
expect 0 0 Debug {^vmod_directors shard:.*point = f08ad325, host = 0}
expect 0 0 Debug {^vmod_directors: shard:.*point = 6e040182, host = 2}
expect 0 0 Debug {^vmod_directors: shard:.*point = bae80b0b, host = 1}
expect 0 0 Debug {^vmod_directors: shard:.*point = f08ad325, host = 0}
expect 0 0 VCL_Log {^-- remove all instances of s1$}
expect 0 0 Debug {^vmod_directors shard:.*point = 6e040182, host = 0}
expect 0 0 Debug {^vmod_directors: shard:.*point = 6e040182, host = 0}
expect 0 0 VCL_Log {^-- re-add some - no 2nd director$}
expect 0 0 Debug {^vmod_directors shard:.*point = 3d1fe97, host = 3}
expect 0 0 Debug {^vmod_directors shard:.*point = a25a43b, host = 6}
expect 0 0 Debug {^vmod_directors shard:.*point = 2b20d9a2, host = 1}
expect 0 0 Debug {^vmod_directors shard:.*point = 6337e62c, host = 8}
expect 0 0 Debug {^vmod_directors shard:.*point = c9803f17, host = 5}
expect 0 0 Debug {^vmod_directors shard:.*point = d51dafe6, host = 0}
expect 0 0 Debug {^vmod_directors shard:.*point = eb74a7d5, host = 4}
expect 0 0 Debug {^vmod_directors shard:.*point = f493ce58, host = 2}
expect 0 0 Debug {^vmod_directors shard:.*point = fc1a5162, host = 7}
expect 0 0 Debug {^vmod_directors: shard:.*point = 3d1fe97, host = 3}
expect 0 0 Debug {^vmod_directors: shard:.*point = a25a43b, host = 6}
expect 0 0 Debug {^vmod_directors: shard:.*point = 2b20d9a2, host = 1}
expect 0 0 Debug {^vmod_directors: shard:.*point = 6337e62c, host = 8}
expect 0 0 Debug {^vmod_directors: shard:.*point = c9803f17, host = 5}
expect 0 0 Debug {^vmod_directors: shard:.*point = d51dafe6, host = 0}
expect 0 0 Debug {^vmod_directors: shard:.*point = eb74a7d5, host = 4}
expect 0 0 Debug {^vmod_directors: shard:.*point = f493ce58, host = 2}
expect 0 0 Debug {^vmod_directors: shard:.*point = fc1a5162, host = 7}
expect 0 0 VCL_Log {^-- remove second-last$}
expect 0 0 Debug {^vmod_directors shard:.*point = 3d1fe97, host = 3}
expect 0 0 Debug {^vmod_directors shard:.*point = a25a43b, host = 6}
expect 0 0 Debug {^vmod_directors shard:.*point = 2b20d9a2, host = 1}
expect 0 0 Debug {^vmod_directors shard:.*point = 6337e62c, host = 7}
expect 0 0 Debug {^vmod_directors shard:.*point = c9803f17, host = 5}
expect 0 0 Debug {^vmod_directors shard:.*point = d51dafe6, host = 0}
expect 0 0 Debug {^vmod_directors shard:.*point = eb74a7d5, host = 4}
expect 0 0 Debug {^vmod_directors shard:.*point = f493ce58, host = 2}
expect 0 0 Debug {^vmod_directors: shard:.*point = 3d1fe97, host = 3}
expect 0 0 Debug {^vmod_directors: shard:.*point = a25a43b, host = 6}
expect 0 0 Debug {^vmod_directors: shard:.*point = 2b20d9a2, host = 1}
expect 0 0 Debug {^vmod_directors: shard:.*point = 6337e62c, host = 7}
expect 0 0 Debug {^vmod_directors: shard:.*point = c9803f17, host = 5}
expect 0 0 Debug {^vmod_directors: shard:.*point = d51dafe6, host = 0}
expect 0 0 Debug {^vmod_directors: shard:.*point = eb74a7d5, host = 4}
expect 0 0 Debug {^vmod_directors: shard:.*point = f493ce58, host = 2}
expect 0 0 VCL_Log {^-- remove last$}
expect 0 0 Debug {^vmod_directors shard:.*point = 3d1fe97, host = 3}
expect 0 0 Debug {^vmod_directors shard:.*point = a25a43b, host = 6}
expect 0 0 Debug {^vmod_directors shard:.*point = 2b20d9a2, host = 1}
expect 0 0 Debug {^vmod_directors shard:.*point = c9803f17, host = 5}
expect 0 0 Debug {^vmod_directors shard:.*point = d51dafe6, host = 0}
expect 0 0 Debug {^vmod_directors shard:.*point = eb74a7d5, host = 4}
expect 0 0 Debug {^vmod_directors shard:.*point = f493ce58, host = 2}
expect 0 0 Debug {^vmod_directors: shard:.*point = 3d1fe97, host = 3}
expect 0 0 Debug {^vmod_directors: shard:.*point = a25a43b, host = 6}
expect 0 0 Debug {^vmod_directors: shard:.*point = 2b20d9a2, host = 1}
expect 0 0 Debug {^vmod_directors: shard:.*point = c9803f17, host = 5}
expect 0 0 Debug {^vmod_directors: shard:.*point = d51dafe6, host = 0}
expect 0 0 Debug {^vmod_directors: shard:.*point = eb74a7d5, host = 4}
expect 0 0 Debug {^vmod_directors: shard:.*point = f493ce58, host = 2}
expect 0 0 VCL_Log {^-- END$}
} -start
......
bin/varnishtest/tests/d00016.vtc
View file @ 76c9e665
......@@ -158,13 +158,13 @@ varnish v1 -vcl+backend {
logexpect l1 -v v1 -g raw -d 1 {
expect * 1001 VCL_Log {^-- invalid replicas$}
expect 0 1001 Error {^vmod_directors shard vd: .reconfigure.. invalid replicas argument 0}
expect 0 1001 Error {^vmod_directors: shard vd: .reconfigure.. invalid replicas argument 0}
expect 0 1001 VCL_Log {^reconfigure failed}
expect 0 1001 VCL_Log {^-- no changes - no debug output$}
expect 0 1001 VCL_Log {^-- no backends$}
expect 0 1001 Error {^vmod_directors shard vd: .reconfigure.. no backends}
expect 0 1001 Error {^vmod_directors: shard vd: .reconfigure.. no backends}
expect 0 1001 VCL_Log {^reconfigure failed}
expect 0 1001 VCL_Log {^-- one backend$}
......@@ -172,15 +172,15 @@ logexpect l1 -v v1 -g raw -d 1 {
expect 0 1001 VCL_Log {^-- no change - no output$}
expect 0 1001 VCL_Log {^-- change, clear, no backends$}
expect 0 1001 Error {^vmod_directors shard vd: .reconfigure.. no backends}
expect 0 1001 Error {^vmod_directors: shard vd: .reconfigure.. no backends}
expect 0 1001 VCL_Log {^reconfigure failed}
expect 0 1001 VCL_Log {^-- duplicate add$}
expect 0 1001 Notice {^vmod_directors shard vd: backend s1 already exists - skipping$}
expect 0 1001 Notice {^vmod_directors: shard vd: backend s1 already exists - skipping$}
expect 0 1001 VCL_Log {^-- duplicate add with idents$}
expect 0 1001 Notice {^vmod_directors shard vd: backend s1 already exists - skipping}
expect 0 1001 Notice {^vmod_directors shard vd: backend s1/s1_1 already exists - skipping}
expect 0 1001 Notice {^vmod_directors shard vd: backend s1/s1_2 already exists - skipping}
expect 0 1001 Notice {^vmod_directors: shard vd: backend s1 already exists - skipping}
expect 0 1001 Notice {^vmod_directors: shard vd: backend s1/s1_1 already exists - skipping}
expect 0 1001 Notice {^vmod_directors: shard vd: backend s1/s1_2 already exists - skipping}
expect 0 1001 VCL_Log {^-- remove s1_2 specifically$}
expect 0 1001 VCL_Log {^-- remove all instances of s1$}
expect 0 1001 VCL_Log {^-- re-add some - no 2nd director$}
......@@ -190,41 +190,41 @@ logexpect l1 -v v1 -g raw -d 1 {
}
logexpect l2 -v v1 -g raw -d 1 {
expect * 0 Debug {^vmod_directors shard:.*point = f08ad325, host = 0}
expect 0 0 Debug {^vmod_directors shard:.*point = 6e040182, host = 1}
expect 0 0 Debug {^vmod_directors shard:.*point = f08ad325, host = 0}
expect 0 0 Debug {^vmod_directors shard:.*point = 6e040182, host = 3}
expect 0 0 Debug {^vmod_directors shard:.*point = 732c7bbe, host = 2}
expect 0 0 Debug {^vmod_directors shard:.*point = bae80b0b, host = 1}
expect 0 0 Debug {^vmod_directors shard:.*point = f08ad325, host = 0}
expect 0 0 Debug {^vmod_directors shard:.*point = 6e040182, host = 2}
expect 0 0 Debug {^vmod_directors shard:.*point = bae80b0b, host = 1}
expect 0 0 Debug {^vmod_directors shard:.*point = f08ad325, host = 0}
expect 0 0 Debug {^vmod_directors shard:.*point = 6e040182, host = 0}
expect 0 0 Debug {^vmod_directors shard:.*point = 3d1fe97, host = 3}
expect 0 0 Debug {^vmod_directors shard:.*point = a25a43b, host = 6}
expect 0 0 Debug {^vmod_directors shard:.*point = 2b20d9a2, host = 1}
expect 0 0 Debug {^vmod_directors shard:.*point = 6337e62c, host = 8}
expect 0 0 Debug {^vmod_directors shard:.*point = c9803f17, host = 5}
expect 0 0 Debug {^vmod_directors shard:.*point = d51dafe6, host = 0}
expect 0 0 Debug {^vmod_directors shard:.*point = eb74a7d5, host = 4}
expect 0 0 Debug {^vmod_directors shard:.*point = f493ce58, host = 2}
expect 0 0 Debug {^vmod_directors shard:.*point = fc1a5162, host = 7}
expect 0 0 Debug {^vmod_directors shard:.*point = 3d1fe97, host = 3}
expect 0 0 Debug {^vmod_directors shard:.*point = a25a43b, host = 6}
expect 0 0 Debug {^vmod_directors shard:.*point = 2b20d9a2, host = 1}
expect 0 0 Debug {^vmod_directors shard:.*point = 6337e62c, host = 7}
expect 0 0 Debug {^vmod_directors shard:.*point = c9803f17, host = 5}
expect 0 0 Debug {^vmod_directors shard:.*point = d51dafe6, host = 0}
expect 0 0 Debug {^vmod_directors shard:.*point = eb74a7d5, host = 4}
expect 0 0 Debug {^vmod_directors shard:.*point = f493ce58, host = 2}
expect 0 0 Debug {^vmod_directors shard:.*point = 3d1fe97, host = 3}
expect 0 0 Debug {^vmod_directors shard:.*point = a25a43b, host = 6}
expect 0 0 Debug {^vmod_directors shard:.*point = 2b20d9a2, host = 1}
expect 0 0 Debug {^vmod_directors shard:.*point = c9803f17, host = 5}
expect 0 0 Debug {^vmod_directors shard:.*point = d51dafe6, host = 0}
expect 0 0 Debug {^vmod_directors shard:.*point = eb74a7d5, host = 4}
expect 0 0 Debug {^vmod_directors shard:.*point = f493ce58, host = 2}
expect * 0 Debug {^vmod_directors: shard:.*point = f08ad325, host = 0}
expect 0 0 Debug {^vmod_directors: shard:.*point = 6e040182, host = 1}
expect 0 0 Debug {^vmod_directors: shard:.*point = f08ad325, host = 0}
expect 0 0 Debug {^vmod_directors: shard:.*point = 6e040182, host = 3}
expect 0 0 Debug {^vmod_directors: shard:.*point = 732c7bbe, host = 2}
expect 0 0 Debug {^vmod_directors: shard:.*point = bae80b0b, host = 1}
expect 0 0 Debug {^vmod_directors: shard:.*point = f08ad325, host = 0}
expect 0 0 Debug {^vmod_directors: shard:.*point = 6e040182, host = 2}
expect 0 0 Debug {^vmod_directors: shard:.*point = bae80b0b, host = 1}
expect 0 0 Debug {^vmod_directors: shard:.*point = f08ad325, host = 0}
expect 0 0 Debug {^vmod_directors: shard:.*point = 6e040182, host = 0}
expect 0 0 Debug {^vmod_directors: shard:.*point = 3d1fe97, host = 3}
expect 0 0 Debug {^vmod_directors: shard:.*point = a25a43b, host = 6}
expect 0 0 Debug {^vmod_directors: shard:.*point = 2b20d9a2, host = 1}
expect 0 0 Debug {^vmod_directors: shard:.*point = 6337e62c, host = 8}
expect 0 0 Debug {^vmod_directors: shard:.*point = c9803f17, host = 5}
expect 0 0 Debug {^vmod_directors: shard:.*point = d51dafe6, host = 0}
expect 0 0 Debug {^vmod_directors: shard:.*point = eb74a7d5, host = 4}
expect 0 0 Debug {^vmod_directors: shard:.*point = f493ce58, host = 2}
expect 0 0 Debug {^vmod_directors: shard:.*point = fc1a5162, host = 7}
expect 0 0 Debug {^vmod_directors: shard:.*point = 3d1fe97, host = 3}
expect 0 0 Debug {^vmod_directors: shard:.*point = a25a43b, host = 6}
expect 0 0 Debug {^vmod_directors: shard:.*point = 2b20d9a2, host = 1}
expect 0 0 Debug {^vmod_directors: shard:.*point = 6337e62c, host = 7}
expect 0 0 Debug {^vmod_directors: shard:.*point = c9803f17, host = 5}
expect 0 0 Debug {^vmod_directors: shard:.*point = d51dafe6, host = 0}
expect 0 0 Debug {^vmod_directors: shard:.*point = eb74a7d5, host = 4}
expect 0 0 Debug {^vmod_directors: shard:.*point = f493ce58, host = 2}
expect 0 0 Debug {^vmod_directors: shard:.*point = 3d1fe97, host = 3}
expect 0 0 Debug {^vmod_directors: shard:.*point = a25a43b, host = 6}
expect 0 0 Debug {^vmod_directors: shard:.*point = 2b20d9a2, host = 1}
expect 0 0 Debug {^vmod_directors: shard:.*point = c9803f17, host = 5}
expect 0 0 Debug {^vmod_directors: shard:.*point = d51dafe6, host = 0}
expect 0 0 Debug {^vmod_directors: shard:.*point = eb74a7d5, host = 4}
expect 0 0 Debug {^vmod_directors: shard:.*point = f493ce58, host = 2}
}
logexpect l1 -start
......
bin/varnishtest/tests/d00017.vtc
View file @ 76c9e665
This diff is collapsed.
bin/varnishtest/tests/d00030.vtc
View file @ 76c9e665
......@@ -24,14 +24,14 @@ varnish v1 -vcl {
logexpect l1 -v v1 -g raw -d 1 {
expect 0 0 CLI {^Rd vcl.load}
expect 0 0 Error {vmod_directors shard p: shard_param.set.. by=BLOB but no or empty key_blob - using key 0}
expect 0 0 Error {vmod_directors: shard p: shard_param.set.. by=BLOB but no or empty key_blob - using key 0}
} -start -wait
logexpect l2 -v v1 -g raw {
expect * 1001 VCL_Error {vmod_directors shard shard: .backend.key_blob. param invalid}
expect * 1001 VCL_Error {vmod_directors: shard shard: .backend.key_blob. param invalid}
} -start
logexpect l3 -v v1 -g raw {
expect * 1003 VCL_Error {vmod_directors shard p: shard_param.set.. may only be used in vcl_init and in backend/pipe context}
expect * 1003 VCL_Error {vmod_directors: shard p: shard_param.set.. may only be used in vcl_init and in backend/pipe context}
} -start
client c1 {
......@@ -159,7 +159,7 @@ varnish v1 -errvcl {invalid warmup argument 1.1} {
}
}
varnish v1 -errvcl {vmod_directors shard shard: .backend(resolve=LAZY) with other parameters can only be used in backend/pipe context} {
varnish v1 -errvcl {vmod_directors: shard shard: .backend(resolve=LAZY) with other parameters can only be used in backend/pipe context} {
import directors;
import blob;
......@@ -172,7 +172,7 @@ varnish v1 -errvcl {vmod_directors shard shard: .backend(resolve=LAZY) with othe
}
}
varnish v1 -errvcl {vmod_directors shard shard: .backend(resolve=NOW) can not be used in vcl_init{}/vcl_fini{}} {
varnish v1 -errvcl {vmod_directors: shard shard: .backend(resolve=NOW) can not be used in vcl_init{}/vcl_fini{}} {
import directors;
import blob;
......
bin/varnishtest/tests/d00041.vtc
View file @ 76c9e665
This diff is collapsed.
doc/changes.rst
View file @ 76c9e665
......@@ -49,7 +49,7 @@ Varnish Cache Next (2021-03-15)
turned into ``Notice`` log messages.
* All shard ``Error`` and ``Notice`` messages now use the unified
prefix ``vmod_directors shard %s``.
prefix ``vmod_directors: shard %s``.
================================
Varnish Cache 6.5.1 (2020-09-25)
......
lib/libvmod_directors/shard_dir.h
View file @ 76c9e665
......@@ -89,16 +89,16 @@ sharddir_backend(const struct sharddir *shardd, unsigned id)
#define SHDBG(flag, shardd, ...) \
do { \
if ((shardd)->debug_flags & (flag)) \
VSL(SLT_Debug, 0, "vmod_directors shard: " \
VSL(SLT_Debug, 0, "vmod_directors_ shard: " \
__VA_ARGS__); \
} while (0)
#define shard_log(vsl, tag, name, fmt, ...) \
sharddir_log(vsl, tag, "vmod_directors shard %s: " fmt, \
sharddir_log(vsl, tag, "vmod_directors: shard %s: " fmt, \
name, __VA_ARGS__)
#define shard_fail(ctx, name, fmt, ...) \
VRT_fail(ctx, "vmod_directors shard %s: " fmt, name, __VA_ARGS__)
VRT_fail(ctx, "vmod_directors: shard %s: " fmt, name, __VA_ARGS__)
#define shard_err(vsl, name, fmt, ...) \
shard_log(vsl, SLT_Error, name, fmt, __VA_ARGS__)
#define shard_err0(vsl, name, msg) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment