Increase virtual site probabilities (#130)

* Increase virtual site probabilities
* Fix lhr09, remove retired sites
* Fix unit test references to real sites

Author: stephen-soltesz

heartbeat/location_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/m-lab/go/mathx"
 	v2 "github.com/m-lab/locate/api/v2"
 	"github.com/m-lab/locate/heartbeat/heartbeattest"
+	"github.com/m-lab/locate/static"
 )
 
 var (
@@ -844,21 +845,24 @@ func TestPickWithProbability(t *testing.T) {
 		// If we use 2 as a seed, the pseudo-random number generated will be < 0.5.
 		{
 			name: "pick-with-probability",
-			site: "yyc02",
+			site: "foo01",
 			seed: 2,
 			want: true,
 		},
 		// If we use 1 as a seed, the pseudo-random number generated will be > 0.5.
 		{
 			name: "do-not-pick-with-probability",
-			site: "yyc02",
+			site: "foo01",
 			seed: 1,
 			want: false,
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			if tt.seed > 0 {
+				static.SiteProbability[tt.site] = 0.5
+			}
 			rand = mathx.NewRandom(tt.seed)
 			got := pickWithProbability(tt.site)
 

static/configs.go

@@ -81,38 +81,38 @@ var LegacyServices = map[string]string{
 // the current number of requests. The default value is 1.0.
 // TODO(github.com/m-lab/locate/issues/92): Make this dynamic.
 var SiteProbability = map[string]float64{
-	"ams10": 0.2, // virtual site
+	"ams10": 0.3, // virtual site
 	"bom01": 0.1,
 	"bom02": 0.1,
-	"bru06": 0.2, // virtual site
-	"cgk01": 0.2, // virtual site
-	"chs01": 0.2, // virtual site
-	"cmh01": 0.2, // virtual site
-	"del03": 0.2, // virtual site
-	"dfw09": 0.2, // virtual site
+	"bru06": 0.3, // virtual site
+	"cgk01": 0.3, // virtual site
+	"chs01": 1.0, // virtual site
+	"cmh01": 0.3, // virtual site
+	"del03": 0.3, // virtual site
+	"dfw09": 0.3, // virtual site
 	"fra07": 1.0, // virtual site
 	"gru01": 0.1,
 	"gru02": 0.1,
 	"gru03": 0.1,
 	"gru04": 0.1,
-	"hel01": 0.2, // virtual site
-	"hkg04": 0.2, // virtual site
+	"hel01": 0.3, // virtual site
+	"hkg04": 0.3, // virtual site
 	"hnd03": 0.1,
 	"hnd04": 0.1,
-	"iad07": 0.2, // virtual site
-	"icn01": 0.2, // virtual site
-	"kix01": 0.2, // virtual site
-	"las01": 0.2, // virtual site
-	"lax07": 0.2, // virtual site
+	"iad07": 1.0, // virtual site
+	"icn01": 0.3, // virtual site
+	"kix01": 0.3, // virtual site
+	"las01": 0.3, // virtual site
+	"lax07": 0.3, // virtual site
 	"lga1t": 0.5,
-	"lhr09": 0.2, // virtual site
+	"lhr09": 0.3, // virtual site
 	"lis01": 0.5,
 	"lju01": 0.5,
-	"mad07": 0.2, // virtual site
-	"mel01": 0.2, // virtual site
-	"mil08": 0.2, // virtual site
-	"oma01": 0.2, // virtual site
-	"ord07": 0.2, // virtual site
+	"mad07": 0.3, // virtual site
+	"mel01": 0.3, // virtual site
+	"mil08": 0.3, // virtual site
+	"oma01": 0.3, // virtual site
+	"ord07": 0.3, // virtual site
 
 	// TRIAL(github.com/m-lab/ops-tracker/issues/1720) for PRG metro.
 	"prg02": 0.3,
@@ -121,24 +121,18 @@ var SiteProbability = map[string]float64{
 	"prg05": 0.3,
 	"prg06": 0.3,
 
-	"par08": 0.2, // virtual site
-	"pdx01": 0.2, // virtual site
-	"scl05": 0.2, // virtual site
-	"sea09": 0.2, // virtual site
-	"sin02": 0.2, // virtual site
-	"slc01": 0.2, // virtual site
-	"syd07": 0.2, // virtual site
-	"tpe02": 0.2, // virtual site
+	"par08": 0.3, // virtual site
+	"pdx01": 0.3, // virtual site
+	"scl05": 0.3, // virtual site
+	"sea09": 0.3, // virtual site
+	"sin02": 0.3, // virtual site
+	"slc01": 0.3, // virtual site
+	"syd07": 0.3, // virtual site
+	"tpe02": 0.3, // virtual site
 	"tun01": 0.5,
 	"vie01": 0.5,
 	"waw01": 1.0, // virtual site
-	"yqm01": 0.5,
-	"yul02": 0.2, // 0.2
-	"yul07": 0.2, // virtual site
-	"yvr01": 0.1, // 0.1
-	"ywg01": 0.5,
-	"yyc02": 0.5,
-	"yyz02": 0.2, // 0.2
-	"yyz07": 0.2, // virtual site
-	"zrh01": 0.2, // virtual site
+	"yul07": 0.3, // virtual site
+	"yyz07": 0.3, // virtual site
+	"zrh01": 0.3, // virtual site
 }