Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow unspecified topology only for the one remaining legacy case #625

Merged
merged 1 commit into from
Dec 12, 2024
Merged

allow unspecified topology only for the one remaining legacy case #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/collector/scrape_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ func Test_TopologyScrapes(t *testing.T) {

s.Clock.StepBy(scrapeInterval)
// negative: empty toplogy should be treated as FlatResourceTopology
plugin.LiquidServiceInfo.Resources = map[liquid.ResourceName]liquid.ResourceInfo{"things": {Topology: ""}}
plugin.LiquidServiceInfo.Resources = map[liquid.ResourceName]liquid.ResourceInfo{"things": {Topology: liquid.FlatResourceTopology}}
plugin.ReportedAZs = map[liquid.AvailabilityZone]struct{}{"az-one": {}}
mustFailT(t, job.ProcessOne(s.Ctx, withLabel), errors.New("during resource scrape of project germany/dresden: service: unittest, resource: things: scrape with topology type: flat returned AZs: [az-one]"))
}
23 changes: 12 additions & 11 deletions internal/plugins/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"slices"

"github.com/sapcc/go-api-declarations/liquid"
"github.com/sapcc/go-bits/logg"
)

func p2u64(val uint64) *uint64 {
Expand All @@ -40,21 +39,23 @@ func SortedMapKeys[M map[K]V, K ~string, V any](mapToSort M) []K {
}

func CheckResourceTopologies(serviceInfo liquid.ServiceInfo) (err error) {
// TODO: remove this special case once liquid-ceph has rolled out their topology support
// (if you come across this, it's probably time; ping Stefan M. to ask for confirmation)
for resName, resInfo := range serviceInfo.Resources {
if resName == "objectstore_region_3_hdd_capacity" && resInfo.Topology == "" {
resInfo.Topology = liquid.FlatResourceTopology
serviceInfo.Resources[resName] = resInfo
}
}

var errs []error
resources := serviceInfo.Resources

resourceNames := SortedMapKeys(resources)
for _, resourceName := range resourceNames {
resInfo := resources[resourceName]
if resInfo.Topology == "" {
// several algorithms inside Limes depend on a topology being chosen, so we have to pick a default for now
// TODO: make this a fatal error once liquid-ceph has rolled out their Topology patch
logg.Error("missing topology on resource: %s (assuming %q)", resourceName, liquid.FlatResourceTopology)
resInfo.Topology = liquid.FlatResourceTopology
resources[resourceName] = resInfo
}
if !resInfo.Topology.IsValid() {
errs = append(errs, fmt.Errorf("invalid topology: %s on resource: %s", resInfo.Topology, resourceName))
topology := resources[resourceName].Topology
if !topology.IsValid() {
errs = append(errs, fmt.Errorf("invalid topology: %s on resource: %s", topology, resourceName))
}
}
if len(errs) > 0 {
Expand Down
Loading