[master] 76c9e6657 shard: one more log message polish iteration

Nils Goroll nils.goroll at uplex.de
Sun Oct 11 13:21:06 UTC 2020


commit 76c9e6657c92b471819daef389475ec047424c91
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Sun Oct 11 15:14:26 2020 +0200

    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

diff --git a/bin/varnishtest/tests/d00015.vtc b/bin/varnishtest/tests/d00015.vtc
index d87bd4498..c283732be 100644
--- a/bin/varnishtest/tests/d00015.vtc
+++ b/bin/varnishtest/tests/d00015.vtc
@@ -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
diff --git a/bin/varnishtest/tests/d00016.vtc b/bin/varnishtest/tests/d00016.vtc
index 0c093a6ac..a0e5a2ea2 100644
--- a/bin/varnishtest/tests/d00016.vtc
+++ b/bin/varnishtest/tests/d00016.vtc
@@ -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
diff --git a/bin/varnishtest/tests/d00017.vtc b/bin/varnishtest/tests/d00017.vtc
index eeabcde5f..357efe57a 100644
--- a/bin/varnishtest/tests/d00017.vtc
+++ b/bin/varnishtest/tests/d00017.vtc
@@ -56,91 +56,91 @@ varnish v1 -vcl+backend {
 # check that the hashcircle points are decremented by one compared to vslp
 #
 # generated from vslp test output
-# perl -ne </tmp/vslp_v0.log 'if (/VSLP hashcircle/) { my @f=split; $f[9] =~ s/\]/./; $f[13] =~ s/,//; $f[13]=hex($f[13]) - 1; $f[16] =~ s/\}//; printf ("\texpect 0 =    Debug {^vmod_directors shard: hashcircle.* %s = .point = %8x, host = %2d.}\n", $f[9], $f[13], $f[16]); }' >/tmp/regression.logexp
+# perl -ne </tmp/vslp_v0.log 'if (/VSLP hashcircle/) { my @f=split; $f[9] =~ s/\]/./; $f[13] =~ s/,//; $f[13]=hex($f[13]) - 1; $f[16] =~ s/\}//; printf ("\texpect 0 =    Debug {^vmod_directors: shard: hashcircle.* %s = .point = %8x, host = %2d.}\n", $f[9], $f[13], $f[16]); }' >/tmp/regression.logexp
 
 logexpect l1 -v v1 -g raw -d 1 {
 	expect 0 0    CLI   "^Rd vcl.load"
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 0. = .point =  3b6b56a, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 1. = .point =  66986a7, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 2. = .point =  7e41e30, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 3. = .point =  b749e7b, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 4. = .point =  e543430, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 5. = .point = 10136c05, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 6. = .point = 102d847f, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 7. = .point = 1112f910, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 8. = .point = 1119a7c7, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 9. = .point = 22464ee9, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 10. = .point = 22b35675, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 11. = .point = 2363bebb, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 12. = .point = 259eeccf, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 13. = .point = 26f0c3e7, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 14. = .point = 28340f35, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 15. = .point = 285e8475, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 16. = .point = 28ec7a6f, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 17. = .point = 2da0e37b, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 18. = .point = 3392487a, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 19. = .point = 37597c4c, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 20. = .point = 4b1f5b22, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 21. = .point = 523723f2, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 22. = .point = 539234db, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 23. = .point = 564ca84f, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 24. = .point = 5d2df428, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 25. = .point = 5fa294ee, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 26. = .point = 60dded53, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 27. = .point = 6257bc27, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 28. = .point = 64014b25, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 29. = .point = 6bfd5a2d, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 30. = .point = 6e040182, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 31. = .point = 6e3819f7, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 32. = .point = 7232b381, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 33. = .point = 74c384ad, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 34. = .point = 83ce71ce, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 35. = .point = 888b6447, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 36. = .point = 8997c018, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 37. = .point = 8aa6b5b4, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 38. = .point = 8b47e6ac, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 39. = .point = 8bc8bc11, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 40. = .point = 8e2d3849, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 41. = .point = 8e7e012c, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 42. = .point = 99892987, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 43. = .point = 9a6f2f00, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 44. = .point = 9ef9125d, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 45. = .point = 9f33cd30, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 46. = .point = 9fc69b51, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 47. = .point = a19f99eb, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 48. = .point = a28b9595, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 49. = .point = a8afe9c4, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 50. = .point = ad923ad3, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 51. = .point = ae8946c6, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 52. = .point = b197e339, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 53. = .point = b3c305e6, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 54. = .point = b6bf43ea, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 55. = .point = b9004d3d, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 56. = .point = bbcc0bad, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 57. = .point = c2542a5d, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 58. = .point = c6c43fa7, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 59. = .point = c945958a, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 60. = .point = cbd9198a, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 61. = .point = d4c93105, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 62. = .point = d7de63b6, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 63. = .point = d937a7df, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 64. = .point = dac52229, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 65. = .point = db7840f0, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 66. = .point = dd5c6bef, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 67. = .point = dfd5333b, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 68. = .point = e991584c, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 69. = .point = ec8891c5, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 70. = .point = ef6b4ab5, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 71. = .point = f08ad325, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 72. = .point = f3325ba2, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 73. = .point = f6530dd1, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 74. = .point = fc28e8d2, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 0. = .point =  3b6b56a, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 1. = .point =  66986a7, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 2. = .point =  7e41e30, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 3. = .point =  b749e7b, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 4. = .point =  e543430, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 5. = .point = 10136c05, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 6. = .point = 102d847f, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 7. = .point = 1112f910, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 8. = .point = 1119a7c7, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 9. = .point = 22464ee9, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 10. = .point = 22b35675, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 11. = .point = 2363bebb, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 12. = .point = 259eeccf, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 13. = .point = 26f0c3e7, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 14. = .point = 28340f35, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 15. = .point = 285e8475, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 16. = .point = 28ec7a6f, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 17. = .point = 2da0e37b, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 18. = .point = 3392487a, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 19. = .point = 37597c4c, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 20. = .point = 4b1f5b22, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 21. = .point = 523723f2, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 22. = .point = 539234db, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 23. = .point = 564ca84f, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 24. = .point = 5d2df428, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 25. = .point = 5fa294ee, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 26. = .point = 60dded53, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 27. = .point = 6257bc27, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 28. = .point = 64014b25, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 29. = .point = 6bfd5a2d, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 30. = .point = 6e040182, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 31. = .point = 6e3819f7, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 32. = .point = 7232b381, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 33. = .point = 74c384ad, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 34. = .point = 83ce71ce, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 35. = .point = 888b6447, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 36. = .point = 8997c018, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 37. = .point = 8aa6b5b4, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 38. = .point = 8b47e6ac, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 39. = .point = 8bc8bc11, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 40. = .point = 8e2d3849, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 41. = .point = 8e7e012c, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 42. = .point = 99892987, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 43. = .point = 9a6f2f00, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 44. = .point = 9ef9125d, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 45. = .point = 9f33cd30, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 46. = .point = 9fc69b51, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 47. = .point = a19f99eb, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 48. = .point = a28b9595, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 49. = .point = a8afe9c4, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 50. = .point = ad923ad3, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 51. = .point = ae8946c6, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 52. = .point = b197e339, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 53. = .point = b3c305e6, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 54. = .point = b6bf43ea, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 55. = .point = b9004d3d, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 56. = .point = bbcc0bad, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 57. = .point = c2542a5d, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 58. = .point = c6c43fa7, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 59. = .point = c945958a, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 60. = .point = cbd9198a, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 61. = .point = d4c93105, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 62. = .point = d7de63b6, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 63. = .point = d937a7df, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 64. = .point = dac52229, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 65. = .point = db7840f0, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 66. = .point = dd5c6bef, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 67. = .point = dfd5333b, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 68. = .point = e991584c, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 69. = .point = ec8891c5, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 70. = .point = ef6b4ab5, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 71. = .point = f08ad325, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 72. = .point = f3325ba2, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 73. = .point = f6530dd1, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 74. = .point = fc28e8d2, host =  2.}
 
 	expect 0 =    CLI   Loaded
 
-	expect * =    Debug {^vmod_directors shard: lookup key 68b902f7 idx 29 host 0}
-	expect * =    Debug {^vmod_directors shard: lookup key 39dc4613 idx 20 host 1}
-	expect * =    Debug {^vmod_directors shard: lookup key c7793505 idx 59 host 2}
+	expect * =    Debug {^vmod_directors: shard: lookup key 68b902f7 idx 29 host 0}
+	expect * =    Debug {^vmod_directors: shard: lookup key 39dc4613 idx 20 host 1}
+	expect * =    Debug {^vmod_directors: shard: lookup key c7793505 idx 59 host 2}
 } -start
 
 client c1 {
diff --git a/bin/varnishtest/tests/d00030.vtc b/bin/varnishtest/tests/d00030.vtc
index c83ba5db9..070dfa74b 100644
--- a/bin/varnishtest/tests/d00030.vtc
+++ b/bin/varnishtest/tests/d00030.vtc
@@ -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;
 
diff --git a/bin/varnishtest/tests/d00041.vtc b/bin/varnishtest/tests/d00041.vtc
index 5d80e0c19..587f1b897 100644
--- a/bin/varnishtest/tests/d00041.vtc
+++ b/bin/varnishtest/tests/d00041.vtc
@@ -49,162 +49,162 @@ varnish v1 -vcl+backend {
 logexpect l1 -v v1 -g raw -d 1 {
 	expect 0 0    CLI   "^Rd vcl.load"
 
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 0. = .point = *238d0ef, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 1. = .point = *321c598, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 2. = .point = *3b6b56a, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 3. = .point = *408ec1e, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 4. = .point = *66986a7, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 5. = .point = *7e41e30, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 6. = .point = *b749e7b, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 7. = .point = *e543430, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 8. = .point = *10136c05, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 9. = .point = *102d847f, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 10. = .point = *1112f910, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 11. = .point = *1119a7c7, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 12. = .point = *14d95c44, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 13. = .point = *150fea1f, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 14. = .point = *1643ecb6, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 15. = .point = *189ff2f2, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 16. = .point = *19cfe9f3, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 17. = .point = *1e1c78c3, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 18. = .point = *1fe0dea0, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 19. = .point = *22464ee9, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 20. = .point = *22b35675, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 21. = .point = *2363bebb, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 22. = .point = *24f827bb, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 23. = .point = *259eeccf, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 24. = .point = *26f0c3e7, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 25. = .point = *271874d4, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 26. = .point = *28340f35, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 27. = .point = *285e8475, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 28. = .point = *28ec7a6f, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 29. = .point = *299c6298, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 30. = .point = *2aedc3f7, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 31. = .point = *2b031742, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 32. = .point = *2da0e37b, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 33. = .point = *310bd2ca, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 34. = .point = *31e5f2df, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 35. = .point = *32d6b3ed, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 36. = .point = *33047373, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 37. = .point = *3392487a, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 38. = .point = *37597c4c, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 39. = .point = *3f6b2b89, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 40. = .point = *43cf6426, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 41. = .point = *46a58f28, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 42. = .point = *4b1f5b22, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 43. = .point = *523723f2, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 44. = .point = *539234db, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 45. = .point = *564ca84f, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 46. = .point = *58501380, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 47. = .point = *58704432, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 48. = .point = *5b1bcbbe, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 49. = .point = *5d2df428, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 50. = .point = *5fa294ee, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 51. = .point = *606fd878, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 52. = .point = *60dded53, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 53. = .point = *616cdb68, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 54. = .point = *6257bc27, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 55. = .point = *64014b25, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 56. = .point = *6918f467, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 57. = .point = *6a08c380, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 58. = .point = *6bfd5a2d, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 59. = .point = *6c0b607a, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 60. = .point = *6c74d296, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 61. = .point = *6e040182, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 62. = .point = *6e3819f7, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 63. = .point = *720ec1a4, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 64. = .point = *7232b381, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 65. = .point = *74c384ad, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 66. = .point = *76d47350, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 67. = .point = *791eb3a3, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 68. = .point = *7a048f20, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 69. = .point = *7f874929, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 70. = .point = *83ce71ce, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 71. = .point = *888b6447, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 72. = .point = *8997c018, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 73. = .point = *89b7d09c, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 74. = .point = *8aa6b5b4, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 75. = .point = *8ae34bde, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 76. = .point = *8b382e03, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 77. = .point = *8b47e6ac, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 78. = .point = *8bc76115, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 79. = .point = *8bc8bc11, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 80. = .point = *8e2d3849, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 81. = .point = *8e7e012c, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 82. = .point = *8f5b4c63, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 83. = .point = *94a94162, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 84. = .point = *99892987, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 85. = .point = *9a6f2f00, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 86. = .point = *9b970b49, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 87. = .point = *9e09a3a7, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 88. = .point = *9ef9125d, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 89. = .point = *9f33cd30, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 90. = .point = *9fc69b51, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 91. = .point = *a19f99eb, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 92. = .point = *a28b9595, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 93. = .point = *a3582038, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 94. = .point = *a4b6a3b9, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 95. = .point = *a66da9cb, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 96. = .point = *a8657c76, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 97. = .point = *a8afe9c4, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 98. = .point = *aa488703, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 99. = .point = *ac7b4454, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 100. = .point = *ad923ad3, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 101. = .point = *ae8946c6, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 102. = .point = *b197e339, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 103. = .point = *b3c305e6, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 104. = .point = *b4dab004, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 105. = .point = *b6bf43ea, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 106. = .point = *b9004d3d, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 107. = .point = *b96b6455, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 108. = .point = *b9a0edb9, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 109. = .point = *b9ec6465, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 110. = .point = *bb8eed4d, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 111. = .point = *bbcc0bad, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 112. = .point = *bcfea141, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 113. = .point = *be300622, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 114. = .point = *bf514d68, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 115. = .point = *c1afc7d2, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 116. = .point = *c2542a5d, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 117. = .point = *c6c43fa7, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 118. = .point = *c945958a, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 119. = .point = *c9f304a4, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 120. = .point = *cb896aa8, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 121. = .point = *cbd9198a, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 122. = .point = *ccd61dad, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 123. = .point = *d07e4431, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 124. = .point = *d21fe35f, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 125. = .point = *d4c93105, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 126. = .point = *d570b815, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 127. = .point = *d7de63b6, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 128. = .point = *d8634aef, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 129. = .point = *d92d916d, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 130. = .point = *d937a7df, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 131. = .point = *dac52229, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 132. = .point = *db7840f0, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 133. = .point = *dd5c6bef, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 134. = .point = *dded5798, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 135. = .point = *dfd5333b, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 136. = .point = *e183345a, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 137. = .point = *e2c71c27, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 138. = .point = *e49bf9d8, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 139. = .point = *e72bc224, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 140. = .point = *e8b27f41, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 141. = .point = *e991584c, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 142. = .point = *ea201c5e, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 143. = .point = *ec8891c5, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 144. = .point = *edcc8dd9, host =  1.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 145. = .point = *ef6b4ab5, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 146. = .point = *f08ad325, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 147. = .point = *f3325ba2, host =  2.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 148. = .point = *f6530dd1, host =  0.}
-	expect 0 =    Debug {^vmod_directors shard: hashcircle.* 149. = .point = *fc28e8d2, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 0. = .point = *238d0ef, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 1. = .point = *321c598, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 2. = .point = *3b6b56a, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 3. = .point = *408ec1e, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 4. = .point = *66986a7, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 5. = .point = *7e41e30, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 6. = .point = *b749e7b, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 7. = .point = *e543430, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 8. = .point = *10136c05, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 9. = .point = *102d847f, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 10. = .point = *1112f910, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 11. = .point = *1119a7c7, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 12. = .point = *14d95c44, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 13. = .point = *150fea1f, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 14. = .point = *1643ecb6, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 15. = .point = *189ff2f2, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 16. = .point = *19cfe9f3, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 17. = .point = *1e1c78c3, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 18. = .point = *1fe0dea0, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 19. = .point = *22464ee9, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 20. = .point = *22b35675, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 21. = .point = *2363bebb, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 22. = .point = *24f827bb, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 23. = .point = *259eeccf, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 24. = .point = *26f0c3e7, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 25. = .point = *271874d4, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 26. = .point = *28340f35, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 27. = .point = *285e8475, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 28. = .point = *28ec7a6f, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 29. = .point = *299c6298, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 30. = .point = *2aedc3f7, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 31. = .point = *2b031742, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 32. = .point = *2da0e37b, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 33. = .point = *310bd2ca, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 34. = .point = *31e5f2df, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 35. = .point = *32d6b3ed, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 36. = .point = *33047373, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 37. = .point = *3392487a, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 38. = .point = *37597c4c, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 39. = .point = *3f6b2b89, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 40. = .point = *43cf6426, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 41. = .point = *46a58f28, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 42. = .point = *4b1f5b22, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 43. = .point = *523723f2, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 44. = .point = *539234db, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 45. = .point = *564ca84f, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 46. = .point = *58501380, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 47. = .point = *58704432, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 48. = .point = *5b1bcbbe, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 49. = .point = *5d2df428, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 50. = .point = *5fa294ee, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 51. = .point = *606fd878, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 52. = .point = *60dded53, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 53. = .point = *616cdb68, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 54. = .point = *6257bc27, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 55. = .point = *64014b25, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 56. = .point = *6918f467, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 57. = .point = *6a08c380, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 58. = .point = *6bfd5a2d, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 59. = .point = *6c0b607a, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 60. = .point = *6c74d296, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 61. = .point = *6e040182, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 62. = .point = *6e3819f7, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 63. = .point = *720ec1a4, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 64. = .point = *7232b381, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 65. = .point = *74c384ad, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 66. = .point = *76d47350, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 67. = .point = *791eb3a3, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 68. = .point = *7a048f20, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 69. = .point = *7f874929, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 70. = .point = *83ce71ce, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 71. = .point = *888b6447, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 72. = .point = *8997c018, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 73. = .point = *89b7d09c, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 74. = .point = *8aa6b5b4, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 75. = .point = *8ae34bde, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 76. = .point = *8b382e03, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 77. = .point = *8b47e6ac, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 78. = .point = *8bc76115, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 79. = .point = *8bc8bc11, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 80. = .point = *8e2d3849, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 81. = .point = *8e7e012c, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 82. = .point = *8f5b4c63, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 83. = .point = *94a94162, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 84. = .point = *99892987, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 85. = .point = *9a6f2f00, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 86. = .point = *9b970b49, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 87. = .point = *9e09a3a7, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 88. = .point = *9ef9125d, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 89. = .point = *9f33cd30, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 90. = .point = *9fc69b51, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 91. = .point = *a19f99eb, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 92. = .point = *a28b9595, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 93. = .point = *a3582038, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 94. = .point = *a4b6a3b9, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 95. = .point = *a66da9cb, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 96. = .point = *a8657c76, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 97. = .point = *a8afe9c4, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 98. = .point = *aa488703, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 99. = .point = *ac7b4454, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 100. = .point = *ad923ad3, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 101. = .point = *ae8946c6, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 102. = .point = *b197e339, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 103. = .point = *b3c305e6, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 104. = .point = *b4dab004, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 105. = .point = *b6bf43ea, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 106. = .point = *b9004d3d, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 107. = .point = *b96b6455, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 108. = .point = *b9a0edb9, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 109. = .point = *b9ec6465, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 110. = .point = *bb8eed4d, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 111. = .point = *bbcc0bad, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 112. = .point = *bcfea141, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 113. = .point = *be300622, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 114. = .point = *bf514d68, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 115. = .point = *c1afc7d2, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 116. = .point = *c2542a5d, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 117. = .point = *c6c43fa7, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 118. = .point = *c945958a, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 119. = .point = *c9f304a4, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 120. = .point = *cb896aa8, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 121. = .point = *cbd9198a, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 122. = .point = *ccd61dad, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 123. = .point = *d07e4431, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 124. = .point = *d21fe35f, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 125. = .point = *d4c93105, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 126. = .point = *d570b815, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 127. = .point = *d7de63b6, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 128. = .point = *d8634aef, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 129. = .point = *d92d916d, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 130. = .point = *d937a7df, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 131. = .point = *dac52229, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 132. = .point = *db7840f0, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 133. = .point = *dd5c6bef, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 134. = .point = *dded5798, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 135. = .point = *dfd5333b, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 136. = .point = *e183345a, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 137. = .point = *e2c71c27, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 138. = .point = *e49bf9d8, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 139. = .point = *e72bc224, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 140. = .point = *e8b27f41, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 141. = .point = *e991584c, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 142. = .point = *ea201c5e, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 143. = .point = *ec8891c5, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 144. = .point = *edcc8dd9, host =  1.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 145. = .point = *ef6b4ab5, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 146. = .point = *f08ad325, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 147. = .point = *f3325ba2, host =  2.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 148. = .point = *f6530dd1, host =  0.}
+	expect 0 =    Debug {^vmod_directors: shard: hashcircle.* 149. = .point = *fc28e8d2, host =  2.}
 
 	expect 0 =    CLI   Loaded
 
-	expect * =    Debug {^vmod_directors shard: lookup key 564ca84f idx 45 host 0}
-	expect * =    Debug {^vmod_directors shard: lookup key 19cfe9f3 idx 16 host 1}
-	expect * =    Debug {^vmod_directors shard: lookup key 46a58f28 idx 41 host 2}
+	expect * =    Debug {^vmod_directors: shard: lookup key 564ca84f idx 45 host 0}
+	expect * =    Debug {^vmod_directors: shard: lookup key 19cfe9f3 idx 16 host 1}
+	expect * =    Debug {^vmod_directors: shard: lookup key 46a58f28 idx 41 host 2}
 } -start
 
 client c1 {
diff --git a/doc/changes.rst b/doc/changes.rst
index 59a6dc52a..a80914c52 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -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)
diff --git a/lib/libvmod_directors/shard_dir.h b/lib/libvmod_directors/shard_dir.h
index 4ec22a1d2..92f505df1 100644
--- a/lib/libvmod_directors/shard_dir.h
+++ b/lib/libvmod_directors/shard_dir.h
@@ -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)			\


More information about the varnish-commit mailing list