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

Fix: Check resource toplogy #620

Merged
merged 1 commit into from
Dec 10, 2024
Merged

Fix: Check resource toplogy #620

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
6 changes: 6 additions & 0 deletions internal/collector/scrape_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,4 +754,10 @@ func Test_TopologyScrapes(t *testing.T) {
plugin.LiquidServiceInfo.Resources = map[liquid.ResourceName]liquid.ResourceInfo{"capacity": {Topology: liquid.AZSeparatedResourceTopology}, "things": {Topology: liquid.AZSeparatedResourceTopology}}
plugin.ReportedAZs = map[liquid.AvailabilityZone]struct{}{"unknown": {}}
mustFailT(t, job.ProcessOne(s.Ctx, withLabel), errors.New("during resource scrape of project germany/berlin: service: unittest, resource: capacity: scrape with topology type: az-separated returned AZs: [unknown]\nservice: unittest, resource: things: scrape with topology type: az-separated returned AZs: [unknown]"))

s.Clock.StepBy(scrapeInterval)
// negative: empty toplogy should be treated as FlatResourceTopology
plugin.LiquidServiceInfo.Resources = map[liquid.ResourceName]liquid.ResourceInfo{"things": {Topology: ""}}
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]"))
}
9 changes: 4 additions & 5 deletions internal/plugins/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,16 @@ func CheckResourceTopologies(serviceInfo liquid.ServiceInfo) (err error) {

resourceNames := SortedMapKeys(resources)
for _, resourceName := range resourceNames {
topology := resources[resourceName].Topology
if topology == "" {
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 := resources[resourceName]
resInfo.Topology = liquid.FlatResourceTopology
resources[resourceName] = resInfo
}
if !topology.IsValid() {
errs = append(errs, fmt.Errorf("invalid topology: %s on resource: %s", topology, resourceName))
if !resInfo.Topology.IsValid() {
errs = append(errs, fmt.Errorf("invalid topology: %s on resource: %s", resInfo.Topology, resourceName))
}
}
if len(errs) > 0 {
Expand Down
Loading