Always pick nodes when org filter is specified (#202)

stephen-soltesz · web-flow · commit 8f61789518e5 · 2024-11-05T10:16:04.000-05:00
like sites, always pick if org specified
diff --git a/heartbeat/location.go b/heartbeat/location.go
@@ -285,8 +285,8 @@ func pickTargets(service string, sites []site) *TargetInfo {
 
 func alwaysPick(opts *NearestOptions) bool {
 	// Sites do not need further filtering if the query is already requesting
-	// only virtual machines or a specific set of sites.
-	return opts.Type == "virtual" || len(opts.Sites) > 0
+	// only virtual machines or a specific set of sites or a specific org.
+	return opts.Type == "virtual" || len(opts.Sites) > 0 || opts.Org != ""
 }
 
 // pickWithProbability returns true if a pseudo-random number in the interval

Original file line number	Diff line number	Diff line change
`@@ -285,8 +285,8 @@ func pickTargets(service string, sites []site) *TargetInfo {`
`285`	`285`
`286`	`286`	`func alwaysPick(opts *NearestOptions) bool {`
`287`	`287`	`// Sites do not need further filtering if the query is already requesting`
`288`		`- // only virtual machines or a specific set of sites.`
`289`		`- return opts.Type == "virtual" \|\| len(opts.Sites) > 0`
	`288`	`+ // only virtual machines or a specific set of sites or a specific org.`
	`289`	`+ return opts.Type == "virtual" \|\| len(opts.Sites) > 0 \|\| opts.Org != ""`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`// pickWithProbability returns true if a pseudo-random number in the interval`