Skip to content

minor logging improvements #148

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

Merged
merged 1 commit into from
Jun 7, 2024
Merged

minor logging improvements #148

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
18 changes: 9 additions & 9 deletions internal/controller/appwrapper/appwrapper_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func (r *AppWrapperReconciler) Reconcile(ctx context.Context, req ctrl.Request)
if err := r.Update(ctx, aw); err != nil {
return ctrl.Result{}, err
}
log.FromContext(ctx).Info("Deleted")
log.FromContext(ctx).Info("Finalizer Deleted")
}
}
return ctrl.Result{}, nil
Expand Down Expand Up @@ -526,7 +526,7 @@ func (r *AppWrapperReconciler) admissionGraceDuration(ctx context.Context, aw *w
if duration, err := time.ParseDuration(userPeriod); err == nil {
return r.limitDuration(duration)
} else {
log.FromContext(ctx).Info("Malformed admission grace period annotation", "annotation", userPeriod, "error", err)
log.FromContext(ctx).Error(err, "Malformed admission grace period annotation; using default", "annotation", userPeriod)
}
}
return r.limitDuration(r.Config.FaultTolerance.AdmissionGracePeriod)
Expand All @@ -537,7 +537,7 @@ func (r *AppWrapperReconciler) warmupGraceDuration(ctx context.Context, aw *work
if duration, err := time.ParseDuration(userPeriod); err == nil {
return r.limitDuration(duration)
} else {
log.FromContext(ctx).Info("Malformed warmup grace period annotation", "annotation", userPeriod, "error", err)
log.FromContext(ctx).Error(err, "Malformed warmup grace period annotation; using default", "annotation", userPeriod)
}
}
return r.limitDuration(r.Config.FaultTolerance.WarmupGracePeriod)
Expand All @@ -548,7 +548,7 @@ func (r *AppWrapperReconciler) failureGraceDuration(ctx context.Context, aw *wor
if duration, err := time.ParseDuration(userPeriod); err == nil {
return r.limitDuration(duration)
} else {
log.FromContext(ctx).Info("Malformed grace period annotation", "annotation", userPeriod, "error", err)
log.FromContext(ctx).Error(err, "Malformed failure grace period annotation; using default", "annotation", userPeriod)
}
}
return r.limitDuration(r.Config.FaultTolerance.FailureGracePeriod)
Expand All @@ -559,7 +559,7 @@ func (r *AppWrapperReconciler) retryLimit(ctx context.Context, aw *workloadv1bet
if limit, err := strconv.Atoi(userLimit); err == nil {
return int32(limit)
} else {
log.FromContext(ctx).Info("Malformed retry limit annotation", "annotation", userLimit, "error", err)
log.FromContext(ctx).Error(err, "Malformed retry limit annotation; using default", "annotation", userLimit)
}
}
return r.Config.FaultTolerance.RetryLimit
Expand All @@ -570,7 +570,7 @@ func (r *AppWrapperReconciler) retryPauseDuration(ctx context.Context, aw *workl
if duration, err := time.ParseDuration(userPeriod); err == nil {
return r.limitDuration(duration)
} else {
log.FromContext(ctx).Info("Malformed retry pause annotation", "annotation", userPeriod, "error", err)
log.FromContext(ctx).Error(err, "Malformed retry pause annotation; using default", "annotation", userPeriod)
}
}
return r.limitDuration(r.Config.FaultTolerance.RetryPausePeriod)
Expand All @@ -581,7 +581,7 @@ func (r *AppWrapperReconciler) forcefulDeletionGraceDuration(ctx context.Context
if duration, err := time.ParseDuration(userPeriod); err == nil {
return r.limitDuration(duration)
} else {
log.FromContext(ctx).Info("Malformed forceful deletion period annotation", "annotation", userPeriod, "error", err)
log.FromContext(ctx).Error(err, "Malformed forceful deletion period annotation; using default", "annotation", userPeriod)
}
}
return r.limitDuration(r.Config.FaultTolerance.ForcefulDeletionGracePeriod)
Expand All @@ -592,7 +592,7 @@ func (r *AppWrapperReconciler) deletionOnFailureGraceDuration(ctx context.Contex
if duration, err := time.ParseDuration(userPeriod); err == nil {
return r.limitDuration(duration)
} else {
log.FromContext(ctx).Info("Malformed delection on failue delay annotation", "annotation", userPeriod, "error", err)
log.FromContext(ctx).Error(err, "Malformed deletion on failure grace period annotation; using default of 0", "annotation", userPeriod)
}
}
return 0 * time.Second
Expand All @@ -605,7 +605,7 @@ func (r *AppWrapperReconciler) timeToLiveAfterSucceededDuration(ctx context.Cont
return duration
}
} else {
log.FromContext(ctx).Info("Malformed successTTL annotation", "annotation", userPeriod, "error", err)
log.FromContext(ctx).Error(err, "Malformed successTTL annotation; using default", "annotation", userPeriod)
}
}
return r.Config.FaultTolerance.SuccessTTL
Expand Down
6 changes: 3 additions & 3 deletions internal/webhook/appwrapper_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ var _ webhook.CustomDefaulter = &AppWrapperWebhook{}
// 3. Add labels with the user name and id
func (w *AppWrapperWebhook) Default(ctx context.Context, obj runtime.Object) error {
aw := obj.(*workloadv1beta2.AppWrapper)
log.FromContext(ctx).Info("Applying defaults", "job", aw)
log.FromContext(ctx).V(2).Info("Applying defaults", "job", aw)

// Queue name and Suspend
if w.Config.EnableKueueIntegrations {
Expand Down Expand Up @@ -97,7 +97,7 @@ var _ webhook.CustomValidator = &AppWrapperWebhook{}
// ValidateCreate validates invariants when an AppWrapper is created
func (w *AppWrapperWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
aw := obj.(*workloadv1beta2.AppWrapper)
log.FromContext(ctx).Info("Validating create", "job", aw)
log.FromContext(ctx).V(2).Info("Validating create", "job", aw)
allErrors := w.validateAppWrapperCreate(ctx, aw)
if w.Config.EnableKueueIntegrations {
allErrors = append(allErrors, jobframework.ValidateCreateForQueueName((*wlc.AppWrapper)(aw))...)
Expand All @@ -109,7 +109,7 @@ func (w *AppWrapperWebhook) ValidateCreate(ctx context.Context, obj runtime.Obje
func (w *AppWrapperWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
oldAW := oldObj.(*workloadv1beta2.AppWrapper)
newAW := newObj.(*workloadv1beta2.AppWrapper)
log.FromContext(ctx).Info("Validating update", "job", newAW)
log.FromContext(ctx).V(2).Info("Validating update", "job", newAW)
allErrors := w.validateAppWrapperUpdate(oldAW, newAW)
if w.Config.EnableKueueIntegrations {
allErrors = append(allErrors, jobframework.ValidateUpdateForQueueName((*wlc.AppWrapper)(oldAW), (*wlc.AppWrapper)(newAW))...)
Expand Down