Skip to content

Commit

Permalink
Adds new donated=[true|false] site annotations + adds core "experimen…
Browse files Browse the repository at this point in the history 
…t" 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.
  • Loading branch information
@nkinkade
nkinkade authored Jun 10, 2024
1 parent ec4b032 commit a2c2afb
Show file tree
Hide file tree
Showing 52 changed files with 62 additions and 5 deletions.
2 changes: 1 addition & 1 deletion experiments.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ local default = {
},
default {
index: 7,
name: 'demo7',
name: 'flooefi',
},
default {
index: 8,
Expand Down
7 changes: 7 additions & 0 deletions formats/v2/sites/donated.json.jsonnet
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
local sites = import 'sites.jsonnet';

[
site.name
for site in sites
if site.annotations.donated == true
]
3 changes: 2 additions & 1 deletion sites/_default.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion sites/_default_virtual.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions sites/akl01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'akl01',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/ath03.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'ath03',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/atl02.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'atl02',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/bcn01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'bcn01',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/beg01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'beg01',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/cpt01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'cpt01',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/dfw08.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'dfw08',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/dub01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'dub01',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/fln01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'fln01',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/fra03.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'fra03',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/geg01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'geg01',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/hkg03.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'hkg03',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/hnl02.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'hnl02',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/iad02.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'iad02',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/jnb01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'jnb01',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/lax06.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'lax06',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/lga08.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'lga08',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/lhr04.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'lhr04',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
3 changes: 2 additions & 1 deletion sites/lju01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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+: {
Expand Down
1 change: 1 addition & 0 deletions sites/mex01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'mex01',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/mex04.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'mex04',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/mia02.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'mia02',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/mil05.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'mil05',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/mnl01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'mnl01',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/mnl02.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'mnl02',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/mpm02.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'mpm02',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/mty01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'mty01',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/nbo01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'nbo01',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/nuq03.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'nuq03',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/nuq08.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'nuq08',
annotations+: {
donated: true,
type: 'physical',
},
machines: {
Expand Down
1 change: 1 addition & 0 deletions sites/ord02.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'ord02',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/par05.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'par05',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/pdx02.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'pdx02',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/per01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'per01',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/sea08.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'sea08',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/sea10.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'sea10',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/svg01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'svg01',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/syd03.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'syd03',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/syd05.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'syd05',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/tgd01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'tgd01',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/tnr01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'tnr01',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/tpe01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'tpe01',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
1 change: 1 addition & 0 deletions sites/trn02.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local sitesDefault = import 'sites/_default.jsonnet';
sitesDefault {
name: 'trn02',
annotations+: {
donated: true,
type: 'physical',
},
machines+: {
Expand Down
3 changes: 2 additions & 1 deletion sites/tun01.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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+: {
Expand Down
Loading

0 comments on commit a2c2afb

Please sign in to comment.