Skip to content

Commit

Permalink
update log message when requeueing with no error (#99)
Browse files Browse the repository at this point in the history
Description of changes:
* When a resource was being requeued without any error, the debug log message reads `requeue needed after error {... , "error": null, "after": "10h0m0s"...}` , which is a red herring for users when debugging controller issues.
* This PR updates the log message correctly to not say `requeue needed after error`, when the resource is being requeued with no error.
* Resource can be requeued without any error for drift remediation.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
  • Loading branch information
vijtrip2 committed Jun 30, 2022
1 parent 6dd4a27 commit 9b4021b
Showing 1 changed file with 17 additions and 9 deletions.
26 changes: 17 additions & 9 deletions pkg/runtime/reconciler.go
Original file line number Diff line number Diff line change
Expand Up @@ -949,20 +949,28 @@ func (r *resourceReconciler) HandleReconcileError(
var requeueNeededAfter *requeue.RequeueNeededAfter
if errors.As(err, &requeueNeededAfter) {
after := requeueNeededAfter.Duration()
rlog.Debug(
"requeue needed after error",
"error", requeueNeededAfter.Unwrap(),
"after", after,
)
if wrappedError := requeueNeededAfter.Unwrap(); wrappedError != nil {
rlog.Debug(
"requeue needed after error",
"error", wrappedError,
"after", after,
)
} else {
rlog.Debug("requeueing", "after", after)
}
return ctrlrt.Result{RequeueAfter: after}, nil
}

var requeueNeeded *requeue.RequeueNeeded
if errors.As(err, &requeueNeeded) {
rlog.Debug(
"requeue needed error",
"error", requeueNeeded.Unwrap(),
)
if wrappedError := requeueNeeded.Unwrap(); wrappedError != nil {
rlog.Debug(
"requeue needed after error",
"error", wrappedError,
)
} else {
rlog.Debug("requeueing immediately")
}
return ctrlrt.Result{Requeue: true}, nil
}

Expand Down

0 comments on commit 9b4021b

Please sign in to comment.