From 2022d8d4d9b83bca6a8ecb6c755c0f52ed05dc10 Mon Sep 17 00:00:00 2001 From: Marcel <156897072+mblos@users.noreply.github.com> Date: Mon, 16 Nov 2026 16:32:43 +0100 Subject: [PATCH 1/2] fix: more stable e2e tests Signed-off-by: Marcel <156897072+mblos@users.noreply.github.com> --- cmd/manager/main.go | 5 +++++ .../scheduling/reservations/commitments/e2e_checks.go | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/cmd/manager/main.go b/cmd/manager/main.go index f9aa8c9b0..fb7f8c0ad 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -136,6 +136,11 @@ func main() { SetOverrideUserAgent(mainConfig.UserAgent.Component, mainConfig.UserAgent.Version) sso.SetUserAgent(mainConfig.UserAgent.Component, mainConfig.UserAgent.Version) + // E2E subcommands return before the flag-configured logger is set up below. + // Set a default logger now so e2e log output is not silently discarded; + // the controller path will override it with the flag-configured zap instance. + ctrl.SetLogger(zap.New()) + // Custom entrypoint for scheduler e2e tests. // Usage: /main [json-override] // The optional json-override is merged on top of the ConfigMap config, e.g.: diff --git a/internal/scheduling/reservations/commitments/e2e_checks.go b/internal/scheduling/reservations/commitments/e2e_checks.go index c03129774..bc5a6a6b1 100644 --- a/internal/scheduling/reservations/commitments/e2e_checks.go +++ b/internal/scheduling/reservations/commitments/e2e_checks.go @@ -225,7 +225,7 @@ func e2eRoundTripResource( "resource", resourceName, "reason", rejectionReason) return } - e2eLog.V(1).Info("round-trip check: commitment accepted", "resource", resourceName, "uuid", testUUID) + e2eLog.Info("round-trip check: commitment accepted", "resource", resourceName, "uuid", testUUID) // Register cleanup immediately so it runs even if the usage check panics. defer func() { @@ -428,7 +428,7 @@ func e2eBatchFlavorGroupResource( "resource", resourceName, "reason", reason) return } - e2eLog.V(1).Info("batch check: batch confirmed", "resource", resourceName, "uuidA", uuidA, "uuidB", uuidB) + e2eLog.Info("batch check: batch confirmed", "resource", resourceName, "uuidA", uuidA, "uuidB", uuidB) report := e2eFetchUsageReport(ctx, baseURL, az, projectID) e2eLogUsageReport(report, az, projectID) @@ -549,10 +549,12 @@ func e2eDryRunResource( rejectionReason := e2eSendChangeCommitments(ctx, baseURL, req, requestTimeout) switch { case rejectionReason == "": - e2eLog.V(1).Info("dry-run check: accepted", "resource", resourceName, "az", az) + e2eLog.Info("dry-run check: accepted", "resource", resourceName, "az", az) case strings.Contains(rejectionReason, "not sufficient capacity") || strings.Contains(rejectionReason, "insufficient CPU cores"): e2eLog.Info("dry-run check: capacity rejection (expected in constrained clusters)", "resource", resourceName, "az", az, "reason", rejectionReason) + case strings.Contains(rejectionReason, "internal error processing dry-run request"): + panic(fmt.Sprintf("dry-run check: internal error for resource %s in %s (likely controller timeout or misconfiguration): %s", resourceName, az, rejectionReason)) default: panic(fmt.Sprintf("dry-run check: unexpected rejection for resource %s in %s: %s", resourceName, az, rejectionReason)) } @@ -822,7 +824,7 @@ func e2eMarketplaceTransferResource( }, } - e2eLog.V(1).Info("transfer check: transferring commitment from projectA to projectB", + e2eLog.Info("transfer check: transferring commitment from projectA to projectB", "resource", resourceName, "uuid", testUUID, "projectA", projectA, "projectB", projectB, "az", az) if reason := e2eSendChangeCommitments(ctx, baseURL, transferReq, requestTimeout); reason != "" { if !strings.Contains(reason, "not sufficient capacity") && !strings.Contains(reason, "insufficient CPU cores") { From a4e0c79e2af5d35a329c9d268f0fcb6ebbf123ec Mon Sep 17 00:00:00 2001 From: Marcel <156897072+mblos@users.noreply.github.com> Date: Mon, 16 Nov 2026 16:33:18 +0100 Subject: [PATCH 2/2] adding logs to flavor extraction Signed-off-by: Marcel <156897072+mblos@users.noreply.github.com> --- .../extractor/plugins/compute/flavor_groups.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/internal/knowledge/extractor/plugins/compute/flavor_groups.go b/internal/knowledge/extractor/plugins/compute/flavor_groups.go index 5b9578cae..9488d722d 100644 --- a/internal/knowledge/extractor/plugins/compute/flavor_groups.go +++ b/internal/knowledge/extractor/plugins/compute/flavor_groups.go @@ -139,6 +139,7 @@ func (e *FlavorGroupExtractor) Extract() ([]plugins.Feature, error) { // Group flavors by flavorGroupIdentifierName groupMap := make(map[string][]FlavorInGroup) + var skippedParseErr, skippedNoHWVersion int for _, row := range rows { // Parse extra_specs JSON @@ -146,6 +147,7 @@ func (e *FlavorGroupExtractor) Extract() ([]plugins.Feature, error) { if row.ExtraSpecs != "" { if err := json.Unmarshal([]byte(row.ExtraSpecs), &extraSpecs); err != nil { flavorGroupLog.V(1).Info("failed to parse extra_specs for flavor", "flavor", row.Name, "error", err) + skippedParseErr++ continue } } @@ -153,6 +155,7 @@ func (e *FlavorGroupExtractor) Extract() ([]plugins.Feature, error) { hwVersion, exists := extraSpecs["quota:hw_version"] if !exists || hwVersion == "" { flavorGroupLog.V(1).Info("flavor missing hw_version extra_spec", "flavor", row.Name) + skippedNoHWVersion++ continue } @@ -175,6 +178,7 @@ func (e *FlavorGroupExtractor) Extract() ([]plugins.Feature, error) { // Convert map to features features := make([]FlavorGroupFeature, 0, len(groupMap)) + var skippedInvalidGroup int for groupName, flavors := range groupMap { if len(flavors) == 0 { continue @@ -243,6 +247,7 @@ func (e *FlavorGroupExtractor) Extract() ([]plugins.Feature, error) { } if err := fg.Validate(); err != nil { flavorGroupLog.Error(err, "skipping flavor group with invalid data", "groupName", groupName) + skippedInvalidGroup++ continue } features = append(features, fg) @@ -253,6 +258,13 @@ func (e *FlavorGroupExtractor) Extract() ([]plugins.Feature, error) { return features[i].Name < features[j].Name }) + flavorGroupLog.Info("flavor group extraction complete", + "totalFlavors", len(rows), + "skippedParseError", skippedParseErr, + "skippedNoHWVersion", skippedNoHWVersion, + "skippedInvalidGroup", skippedInvalidGroup, + "groups", len(features)) + return e.Extracted(features) }