Commit 999da0fa authored by Nils Goroll's avatar Nils Goroll

Test replacement for shard .key method alg= argument which is to be retired

parent df7f4aa7
Pipeline #410 skipped
...@@ -25,6 +25,8 @@ server s3 { ...@@ -25,6 +25,8 @@ server s3 {
varnish v1 -vcl+backend { varnish v1 -vcl+backend {
import std; import std;
import directors; import directors;
import blobdigest;
import blob;
sub vcl_init { sub vcl_init {
new vd = directors.shard(); new vd = directors.shard();
...@@ -44,8 +46,9 @@ varnish v1 -vcl+backend { ...@@ -44,8 +46,9 @@ varnish v1 -vcl+backend {
} }
sub vcl_recv { sub vcl_recv {
set req.backend_hint = vd.backend(by=KEY, set req.backend_hint = vd.backend(by=BLOB,
key=vd.key(req.url, CRC32)); key_blob=blobdigest.hash(ICRC32,
blob.decode(encoded=req.url)));
return(pass); return(pass);
} }
......
...@@ -17,6 +17,8 @@ server s3 { ...@@ -17,6 +17,8 @@ server s3 {
varnish v1 -vcl+backend { varnish v1 -vcl+backend {
import directors; import directors;
import blobdigest;
import blob;
sub vcl_init { sub vcl_init {
new vd = directors.shard(); new vd = directors.shard();
...@@ -27,8 +29,9 @@ varnish v1 -vcl+backend { ...@@ -27,8 +29,9 @@ varnish v1 -vcl+backend {
} }
sub vcl_recv { sub vcl_recv {
set req.backend_hint = vd.backend(by=KEY, set req.backend_hint = vd.backend(by=BLOB,
key=vd.key(req.url, alg=RS)); key_blob=blobdigest.hash(RS,
blob.decode(encoded=req.url)));
return(pass); return(pass);
} }
......
...@@ -21,6 +21,8 @@ server s3 { ...@@ -21,6 +21,8 @@ server s3 {
varnish v1 -vcl+backend { varnish v1 -vcl+backend {
import directors; import directors;
import blobdigest;
import blob;
sub vcl_init { sub vcl_init {
new vd = directors.shard(); new vd = directors.shard();
...@@ -31,14 +33,16 @@ varnish v1 -vcl+backend { ...@@ -31,14 +33,16 @@ varnish v1 -vcl+backend {
} }
sub recv_sub { sub recv_sub {
set req.backend_hint = vd.backend(by=KEY, set req.backend_hint = vd.backend(by=BLOB,
key=vd.key(req.http.X-Hash, RS)); key_blob=blobdigest.hash(RS,
blob.decode(encoded=req.http.X-Hash)));
} }
sub vcl_recv { sub vcl_recv {
if (req.url == "/1") { if (req.url == "/1") {
set req.backend_hint = vd.backend(by=KEY, set req.backend_hint = vd.backend(by=BLOB,
key=vd.key(alg=CRC32, string="/eishoSu2")); key_blob=blobdigest.hash(ICRC32,
blob.decode(encoded="/eishoSu2")));
} else if (req.url == "/2") { } else if (req.url == "/2") {
set req.backend_hint = vd.backend(by=KEY, set req.backend_hint = vd.backend(by=KEY,
key=vd.key("/eishoSu2")); key=vd.key("/eishoSu2"));
...@@ -49,8 +53,9 @@ varnish v1 -vcl+backend { ...@@ -49,8 +53,9 @@ varnish v1 -vcl+backend {
set req.backend_hint = vd.backend(by=KEY, set req.backend_hint = vd.backend(by=KEY,
key=vd.key(req.http.NonExistent)); key=vd.key(req.http.NonExistent));
} else if (req.url == "/null_by_string_hash") { } else if (req.url == "/null_by_string_hash") {
set req.backend_hint = vd.backend(by=KEY, set req.backend_hint = vd.backend(by=BLOB,
key=vd.key(req.http.NonExistent, SHA256)); key_blob=blobdigest.hash(SHA256,
blob.decode(encoded="/eishoSu2")));
} }
return(pass); return(pass);
} }
......
...@@ -29,6 +29,8 @@ server s3 { ...@@ -29,6 +29,8 @@ server s3 {
varnish v1 -vcl+backend { varnish v1 -vcl+backend {
import directors; import directors;
import blobdigest;
import blob;
sub vcl_init { sub vcl_init {
new vd = directors.shard(); new vd = directors.shard();
...@@ -36,11 +38,15 @@ varnish v1 -vcl+backend { ...@@ -36,11 +38,15 @@ varnish v1 -vcl+backend {
vd.add_backend(s2); vd.add_backend(s2);
vd.add_backend(s3); vd.add_backend(s3);
vd.reconfigure(25); vd.reconfigure(25);
new key = blobdigest.digest(ICRC32,
blob.decode(encoded="/eishoSu2"));
key.final();
} }
sub vcl_recv { sub vcl_recv {
set req.backend_hint = vd.backend(by=KEY, set req.backend_hint = vd.backend(by=BLOB,
key=vd.key("/eishoSu2", CRC32), key_blob=key.final(),
alt=req.restarts, alt=req.restarts,
healthy=ALL); healthy=ALL);
......
...@@ -20,6 +20,8 @@ server s3 { ...@@ -20,6 +20,8 @@ server s3 {
varnish v1 -vcl+backend { varnish v1 -vcl+backend {
import std; import std;
import directors; import directors;
import blobdigest;
import blob;
sub vcl_init { sub vcl_init {
new vd = directors.shard(); new vd = directors.shard();
...@@ -28,11 +30,15 @@ varnish v1 -vcl+backend { ...@@ -28,11 +30,15 @@ varnish v1 -vcl+backend {
vd.add_backend(s2); vd.add_backend(s2);
vd.add_backend(s3); vd.add_backend(s3);
vd.reconfigure(25); vd.reconfigure(25);
new key = blobdigest.digest(ICRC32,
blob.decode(encoded="/eishoSu2"));
key.final();
} }
sub vcl_recv { sub vcl_recv {
set req.backend_hint = vd.backend(by=KEY, set req.backend_hint = vd.backend(by=BLOB,
key=vd.key("/eishoSu2", CRC32)); key_blob=key.final());
set req.http.healthy = std.healthy(req.backend_hint); set req.http.healthy = std.healthy(req.backend_hint);
return(pass); return(pass);
} }
......
...@@ -22,6 +22,8 @@ server s3 { ...@@ -22,6 +22,8 @@ server s3 {
varnish v1 -vcl+backend { varnish v1 -vcl+backend {
import directors; import directors;
import blobdigest;
import blob;
sub vcl_init { sub vcl_init {
new vd = directors.shard(); new vd = directors.shard();
...@@ -31,11 +33,15 @@ varnish v1 -vcl+backend { ...@@ -31,11 +33,15 @@ varnish v1 -vcl+backend {
vd.add_backend(s3); vd.add_backend(s3);
vd.set_rampup(15s); vd.set_rampup(15s);
vd.reconfigure(25); vd.reconfigure(25);
new key = blobdigest.digest(ICRC32,
blob.decode(encoded="/eishoSu2"));
key.final();
} }
sub vcl_recv { sub vcl_recv {
set req.backend_hint = vd.backend(by=KEY, set req.backend_hint = vd.backend(by=BLOB,
key=vd.key(alg=CRC32, string="/eishoSu2")); key_blob=key.final());
return(pass); return(pass);
} }
} -start } -start
......
...@@ -17,6 +17,8 @@ server s3 { ...@@ -17,6 +17,8 @@ server s3 {
varnish v1 -vcl+backend { varnish v1 -vcl+backend {
import directors; import directors;
import blobdigest;
import blob;
sub vcl_init { sub vcl_init {
new vd = directors.shard(); new vd = directors.shard();
...@@ -27,8 +29,9 @@ varnish v1 -vcl+backend { ...@@ -27,8 +29,9 @@ varnish v1 -vcl+backend {
} }
sub vcl_backend_fetch { sub vcl_backend_fetch {
set bereq.backend = vd.backend(by=KEY, set bereq.backend = vd.backend(by=BLOB,
key=vd.key(bereq.url, CRC32)); key_blob=blobdigest.hash(ICRC32,
blob.decode(encoded=bereq.url)));
return(fetch); return(fetch);
} }
......
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