Skip to content

Commit

Permalink
Merge pull request kubernetes#125698 from pohly/dra-log-output
Browse files Browse the repository at this point in the history
DRA: log output
  • Loading branch information
k8s-ci-robot committed Jun 26, 2024
2 parents 8637867 + 2da9e66 commit 1d51766
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
1 change: 1 addition & 0 deletions pkg/controller/resourceclaim/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,7 @@ func (ec *Controller) handleClaim(ctx context.Context, pod *v1.Pod, podClaim v1.
metrics.ResourceClaimCreateFailures.Inc()
return fmt.Errorf("create ResourceClaim %s: %v", claimName, err)
}
logger.V(4).Info("Created ResourceClaim", "claim", klog.KObj(claim), "pod", klog.KObj(pod))
ec.claimCache.Mutation(claim)
}

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/dra/test-driver/app/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ func (c *ExampleController) allocateOneByOne(ctx context.Context, claimAllocatio
for _, ca := range claimAllocations {
allocationResult, err := c.allocateOne(ctx, ca.Claim, ca.ClaimParameters, ca.Class, ca.ClassParameters, selectedNode)
if err != nil {
ca.Error = fmt.Errorf("failed allocating claim %v", ca.Claim.UID)
ca.Error = err
continue
}
ca.Allocation = allocationResult
Expand Down
15 changes: 14 additions & 1 deletion test/utils/ktesting/tcontext.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"context"
"flag"
"fmt"
"strings"
"time"

"github.com/onsi/gomega"
Expand Down Expand Up @@ -242,7 +243,19 @@ func Init(tb TB, opts ...InitOption) TContext {
if c.PerTestOutput {
config := ktesting.NewConfig(
ktesting.AnyToString(func(v interface{}) string {
return format.Object(v, 1)
// For basic types where the string
// representation is "obvious" we use
// fmt.Sprintf because format.Object always
// adds a <"type"> prefix, which is too long
// for simple values.
switch v := v.(type) {
case int, int32, int64, uint, uint32, uint64, float32, float64, bool:
return fmt.Sprintf("%v", v)
case string:
return v
default:
return strings.TrimSpace(format.Object(v, 1))
}
}),
ktesting.VerbosityFlagName("v"),
ktesting.VModuleFlagName("vmodule"),
Expand Down

0 comments on commit 1d51766

Please sign in to comment.