github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

DRA resource claim controller: improve log messages

Browse Source 
Some code paths didn't log anything. One log message about "claim got deleted"
was incorrect.
This commit is contained in:
Patrick Ohly 2024-09-12 17:07:40 +02:00
parent b7fb82f9d8
commit d572df2493
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/controller/resourceclaim/controller.go
View File

@ -233,7 +233,10 @@ func (ec *Controller) enqueuePod(logger klog.Logger, obj interface{}, deleted bo
logger.V(6).Info("pod with resource claims changed", "pod", klog.KObj(pod), "deleted", deleted) logger.V(6).Info("pod with resource claims changed", "pod", klog.KObj(pod), "deleted", deleted)
// Release reservations of a deleted or completed pod? // Release reservations of a deleted or completed pod?
if needsClaims, reason := podNeedsClaims(pod, deleted); !needsClaims { needsClaims, reason := podNeedsClaims(pod, deleted)
if needsClaims {
logger.V(6).Info("Not touching claims", "pod", klog.KObj(pod), "reason", reason)
} else {
for _, podClaim := range pod.Spec.ResourceClaims { for _, podClaim := range pod.Spec.ResourceClaims {
claimName, _, err := resourceclaim.Name(pod, &podClaim) claimName, _, err := resourceclaim.Name(pod, &podClaim)
switch { switch {
@ -241,14 +244,14 @@ func (ec *Controller) enqueuePod(logger klog.Logger, obj interface{}, deleted bo
// Either the claim was not created (nothing to do here) or // Either the claim was not created (nothing to do here) or
// the API changed. The later will also get reported elsewhere, // the API changed. The later will also get reported elsewhere,
// so here it's just a debug message. // so here it's just a debug message.
logger.V(6).Info("Nothing to do for claim during pod change", "err", err, "reason", reason) logger.V(6).Info("Nothing to do for claim during pod change", "pod", klog.KObj(pod), "podClaim", podClaim.Name, "err", err, "reason", reason)
case claimName != nil: case claimName != nil:
key := claimKeyPrefix + pod.Namespace + "/" + *claimName key := claimKeyPrefix + pod.Namespace + "/" + *claimName
logger.V(6).Info("Process claim", "pod", klog.KObj(pod), "key", key, "reason", reason) logger.V(6).Info("Process claim", "pod", klog.KObj(pod), "claim", klog.KRef(pod.Namespace, *claimName), "key", key, "reason", reason)
ec.queue.Add(key) ec.queue.Add(key)
default: default:
// Nothing to do, claim wasn't generated. // Nothing to do, claim wasn't generated.
logger.V(6).Info("Nothing to do for skipped claim during pod change", "reason", reason) logger.V(6).Info("Nothing to do for skipped claim during pod change", "pod", klog.KObj(pod), "podClaim", podClaim.Name, "reason", reason)
} }
} }
} }
@ -382,7 +385,7 @@ func (ec *Controller) enqueueResourceClaim(logger klog.Logger, obj interface{},
return return
} }
if len(objs) == 0 { if len(objs) == 0 {
logger.V(6).Info("claim got deleted while not needed by any pod, nothing to do", "claim", klog.KObj(claim)) logger.V(6).Info("unrelated to any known pod", "claim", klog.KObj(claim))
return return
} }
for _, obj := range objs { for _, obj := range objs {