From a2c2afb5439541d30126d86d5d7805340b984840 Mon Sep 17 00:00:00 2001 From: nkinkade Date: Mon, 10 Jun 2024 13:08:17 -0400 Subject: [PATCH] Adds new donated=[true|false] site annotations + adds core "experiment" flooefi (#337) * Adds new "donated" site annotation This new annotation indicates whether a site was donated or not. * Adds new "donated" format to list donated sites * Adds experiment "flooefi" as index 7 This is not an actual experiment, but we are just using this mechanism to temporarily deploy this Google-internal service for testing in sandbox and staging. --- experiments.jsonnet | 2 +- formats/v2/sites/donated.json.jsonnet | 7 +++++++ sites/_default.jsonnet | 3 ++- sites/_default_virtual.jsonnet | 3 ++- sites/akl01.jsonnet | 1 + sites/ath03.jsonnet | 1 + sites/atl02.jsonnet | 1 + sites/bcn01.jsonnet | 1 + sites/beg01.jsonnet | 1 + sites/cpt01.jsonnet | 1 + sites/dfw08.jsonnet | 1 + sites/dub01.jsonnet | 1 + sites/fln01.jsonnet | 1 + sites/fra03.jsonnet | 1 + sites/geg01.jsonnet | 1 + sites/hkg03.jsonnet | 1 + sites/hnl02.jsonnet | 1 + sites/iad02.jsonnet | 1 + sites/jnb01.jsonnet | 1 + sites/lax06.jsonnet | 1 + sites/lga08.jsonnet | 1 + sites/lhr04.jsonnet | 1 + sites/lju01.jsonnet | 3 ++- sites/mex01.jsonnet | 1 + sites/mex04.jsonnet | 1 + sites/mia02.jsonnet | 1 + sites/mil05.jsonnet | 1 + sites/mnl01.jsonnet | 1 + sites/mnl02.jsonnet | 1 + sites/mpm02.jsonnet | 1 + sites/mty01.jsonnet | 1 + sites/nbo01.jsonnet | 1 + sites/nuq03.jsonnet | 1 + sites/nuq08.jsonnet | 1 + sites/ord02.jsonnet | 1 + sites/par05.jsonnet | 1 + sites/pdx02.jsonnet | 1 + sites/per01.jsonnet | 1 + sites/sea08.jsonnet | 1 + sites/sea10.jsonnet | 1 + sites/svg01.jsonnet | 1 + sites/syd03.jsonnet | 1 + sites/syd05.jsonnet | 1 + sites/tgd01.jsonnet | 1 + sites/tnr01.jsonnet | 1 + sites/tpe01.jsonnet | 1 + sites/trn02.jsonnet | 1 + sites/tun01.jsonnet | 3 ++- sites/wlg02.jsonnet | 1 + sites/yul06.jsonnet | 1 + sites/yvr03.jsonnet | 1 + sites/yyz06.jsonnet | 1 + 52 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 formats/v2/sites/donated.json.jsonnet diff --git a/experiments.jsonnet b/experiments.jsonnet index 4b84d796..10b0a6ef 100644 --- a/experiments.jsonnet +++ b/experiments.jsonnet @@ -37,7 +37,7 @@ local default = { }, default { index: 7, - name: 'demo7', + name: 'flooefi', }, default { index: 8, diff --git a/formats/v2/sites/donated.json.jsonnet b/formats/v2/sites/donated.json.jsonnet new file mode 100644 index 00000000..a7825552 --- /dev/null +++ b/formats/v2/sites/donated.json.jsonnet @@ -0,0 +1,7 @@ +local sites = import 'sites.jsonnet'; + +[ + site.name + for site in sites + if site.annotations.donated == true +] diff --git a/sites/_default.jsonnet b/sites/_default.jsonnet index 90cd3212..124af1d7 100644 --- a/sites/_default.jsonnet +++ b/sites/_default.jsonnet @@ -3,9 +3,10 @@ local site = import 'lib/site.jsonnet'; site { name: error 'Must override site name', annotations: { + donated: false, + probability: 1.0, provider: 'mlab', type: 'physical', - probability: 1.0, }, loadbalancer: { roundrobin: true, diff --git a/sites/_default_virtual.jsonnet b/sites/_default_virtual.jsonnet index dcf890dc..1e4db56b 100644 --- a/sites/_default_virtual.jsonnet +++ b/sites/_default_virtual.jsonnet @@ -3,9 +3,10 @@ local site = import 'lib/site_virtual.jsonnet'; site { name: error 'Must override site name', annotations: { + donated: false, + probability: 1.0, provider: 'mlab', type: 'virtual', - probability: 1.0, }, loadbalancer: { roundrobin: true, diff --git a/sites/akl01.jsonnet b/sites/akl01.jsonnet index 719d7010..caa8b2e6 100644 --- a/sites/akl01.jsonnet +++ b/sites/akl01.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'akl01', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/ath03.jsonnet b/sites/ath03.jsonnet index 375784a4..5dcfaf11 100644 --- a/sites/ath03.jsonnet +++ b/sites/ath03.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'ath03', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/atl02.jsonnet b/sites/atl02.jsonnet index ecd3a0ae..a69c4970 100644 --- a/sites/atl02.jsonnet +++ b/sites/atl02.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'atl02', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/bcn01.jsonnet b/sites/bcn01.jsonnet index 15733430..71437f1a 100644 --- a/sites/bcn01.jsonnet +++ b/sites/bcn01.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'bcn01', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/beg01.jsonnet b/sites/beg01.jsonnet index 97bcd012..c5da7b32 100644 --- a/sites/beg01.jsonnet +++ b/sites/beg01.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'beg01', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/cpt01.jsonnet b/sites/cpt01.jsonnet index 8758657c..90638296 100644 --- a/sites/cpt01.jsonnet +++ b/sites/cpt01.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'cpt01', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/dfw08.jsonnet b/sites/dfw08.jsonnet index 63111353..18cc2392 100644 --- a/sites/dfw08.jsonnet +++ b/sites/dfw08.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'dfw08', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/dub01.jsonnet b/sites/dub01.jsonnet index 65446c19..d9282d4b 100644 --- a/sites/dub01.jsonnet +++ b/sites/dub01.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'dub01', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/fln01.jsonnet b/sites/fln01.jsonnet index c035404d..08d45b2f 100644 --- a/sites/fln01.jsonnet +++ b/sites/fln01.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'fln01', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/fra03.jsonnet b/sites/fra03.jsonnet index e5b087aa..5919f565 100644 --- a/sites/fra03.jsonnet +++ b/sites/fra03.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'fra03', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/geg01.jsonnet b/sites/geg01.jsonnet index 55313e42..e5558eb3 100644 --- a/sites/geg01.jsonnet +++ b/sites/geg01.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'geg01', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/hkg03.jsonnet b/sites/hkg03.jsonnet index 03385d4c..24a0b6f8 100644 --- a/sites/hkg03.jsonnet +++ b/sites/hkg03.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'hkg03', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/hnl02.jsonnet b/sites/hnl02.jsonnet index c86f07e4..4e917aac 100644 --- a/sites/hnl02.jsonnet +++ b/sites/hnl02.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'hnl02', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/iad02.jsonnet b/sites/iad02.jsonnet index 67a75e5f..04a56d55 100644 --- a/sites/iad02.jsonnet +++ b/sites/iad02.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'iad02', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/jnb01.jsonnet b/sites/jnb01.jsonnet index 92e0e627..937229fd 100644 --- a/sites/jnb01.jsonnet +++ b/sites/jnb01.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'jnb01', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/lax06.jsonnet b/sites/lax06.jsonnet index 1f03c6a7..38fbb9af 100644 --- a/sites/lax06.jsonnet +++ b/sites/lax06.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'lax06', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/lga08.jsonnet b/sites/lga08.jsonnet index 7cdea7b2..68c5ee5a 100644 --- a/sites/lga08.jsonnet +++ b/sites/lga08.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'lga08', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/lhr04.jsonnet b/sites/lhr04.jsonnet index b603ae6d..411ea24e 100644 --- a/sites/lhr04.jsonnet +++ b/sites/lhr04.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'lhr04', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/lju01.jsonnet b/sites/lju01.jsonnet index eeab8d51..63da391f 100644 --- a/sites/lju01.jsonnet +++ b/sites/lju01.jsonnet @@ -3,8 +3,9 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'lju01', annotations+: { - type: 'physical', + donated: true, probability: 0.5, + type: 'physical', }, machines+: { mlab1+: { diff --git a/sites/mex01.jsonnet b/sites/mex01.jsonnet index d6c244ec..6d3c1dcd 100644 --- a/sites/mex01.jsonnet +++ b/sites/mex01.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'mex01', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/mex04.jsonnet b/sites/mex04.jsonnet index a9ea8103..885020d6 100644 --- a/sites/mex04.jsonnet +++ b/sites/mex04.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'mex04', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/mia02.jsonnet b/sites/mia02.jsonnet index 7936d2e8..2546652a 100644 --- a/sites/mia02.jsonnet +++ b/sites/mia02.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'mia02', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/mil05.jsonnet b/sites/mil05.jsonnet index 66bbd69b..a45fe501 100644 --- a/sites/mil05.jsonnet +++ b/sites/mil05.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'mil05', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/mnl01.jsonnet b/sites/mnl01.jsonnet index 8eef96e1..4581fec5 100644 --- a/sites/mnl01.jsonnet +++ b/sites/mnl01.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'mnl01', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/mnl02.jsonnet b/sites/mnl02.jsonnet index ebe0eb39..05de0586 100644 --- a/sites/mnl02.jsonnet +++ b/sites/mnl02.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'mnl02', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/mpm02.jsonnet b/sites/mpm02.jsonnet index a04bb7af..07cff726 100644 --- a/sites/mpm02.jsonnet +++ b/sites/mpm02.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'mpm02', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/mty01.jsonnet b/sites/mty01.jsonnet index b683c4b4..34a9d967 100644 --- a/sites/mty01.jsonnet +++ b/sites/mty01.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'mty01', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/nbo01.jsonnet b/sites/nbo01.jsonnet index 59c916e5..2db52989 100644 --- a/sites/nbo01.jsonnet +++ b/sites/nbo01.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'nbo01', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/nuq03.jsonnet b/sites/nuq03.jsonnet index 1b6e0852..6eaf4d1e 100644 --- a/sites/nuq03.jsonnet +++ b/sites/nuq03.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'nuq03', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/nuq08.jsonnet b/sites/nuq08.jsonnet index 598ca419..049ffd8a 100644 --- a/sites/nuq08.jsonnet +++ b/sites/nuq08.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'nuq08', annotations+: { + donated: true, type: 'physical', }, machines: { diff --git a/sites/ord02.jsonnet b/sites/ord02.jsonnet index 9a2967c8..41ddeddb 100644 --- a/sites/ord02.jsonnet +++ b/sites/ord02.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'ord02', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/par05.jsonnet b/sites/par05.jsonnet index bf76ee70..c91d58be 100644 --- a/sites/par05.jsonnet +++ b/sites/par05.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'par05', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/pdx02.jsonnet b/sites/pdx02.jsonnet index 218ca6ac..35722936 100644 --- a/sites/pdx02.jsonnet +++ b/sites/pdx02.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'pdx02', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/per01.jsonnet b/sites/per01.jsonnet index 80ce6ccb..c0d34f38 100644 --- a/sites/per01.jsonnet +++ b/sites/per01.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'per01', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/sea08.jsonnet b/sites/sea08.jsonnet index 00dbece8..13aaf86f 100644 --- a/sites/sea08.jsonnet +++ b/sites/sea08.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'sea08', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/sea10.jsonnet b/sites/sea10.jsonnet index c0dd7d9f..d2ac9655 100644 --- a/sites/sea10.jsonnet +++ b/sites/sea10.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'sea10', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/svg01.jsonnet b/sites/svg01.jsonnet index 3001021e..d894934c 100644 --- a/sites/svg01.jsonnet +++ b/sites/svg01.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'svg01', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/syd03.jsonnet b/sites/syd03.jsonnet index bf6bdb0c..26bc0862 100644 --- a/sites/syd03.jsonnet +++ b/sites/syd03.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'syd03', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/syd05.jsonnet b/sites/syd05.jsonnet index 00302096..0984afc6 100644 --- a/sites/syd05.jsonnet +++ b/sites/syd05.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'syd05', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/tgd01.jsonnet b/sites/tgd01.jsonnet index 101a35e5..9c918ff4 100644 --- a/sites/tgd01.jsonnet +++ b/sites/tgd01.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'tgd01', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/tnr01.jsonnet b/sites/tnr01.jsonnet index b431ec9c..d9f50fa9 100644 --- a/sites/tnr01.jsonnet +++ b/sites/tnr01.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'tnr01', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/tpe01.jsonnet b/sites/tpe01.jsonnet index 24431783..8dcea2f0 100644 --- a/sites/tpe01.jsonnet +++ b/sites/tpe01.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'tpe01', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/trn02.jsonnet b/sites/trn02.jsonnet index 4f618801..ea964419 100644 --- a/sites/trn02.jsonnet +++ b/sites/trn02.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'trn02', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/tun01.jsonnet b/sites/tun01.jsonnet index 6531dfc8..be4d6bf1 100644 --- a/sites/tun01.jsonnet +++ b/sites/tun01.jsonnet @@ -3,8 +3,9 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'tun01', annotations+: { - type: 'physical', + donated: true, probability: 0.5, + type: 'physical', }, machines+: { mlab1+: { diff --git a/sites/wlg02.jsonnet b/sites/wlg02.jsonnet index 67c28d3d..0bec9f37 100644 --- a/sites/wlg02.jsonnet +++ b/sites/wlg02.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'wlg02', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/yul06.jsonnet b/sites/yul06.jsonnet index 5a798778..e06e3b58 100644 --- a/sites/yul06.jsonnet +++ b/sites/yul06.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'yul06', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/yvr03.jsonnet b/sites/yvr03.jsonnet index 3558c664..8bc6522d 100644 --- a/sites/yvr03.jsonnet +++ b/sites/yvr03.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'yvr03', annotations+: { + donated: true, type: 'physical', }, machines+: { diff --git a/sites/yyz06.jsonnet b/sites/yyz06.jsonnet index 52116621..a31f5d72 100644 --- a/sites/yyz06.jsonnet +++ b/sites/yyz06.jsonnet @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet'; sitesDefault { name: 'yyz06', annotations+: { + donated: true, type: 'physical', }, machines+: {