Skip to content

Commit b11a1f4

Browse files
authored
refactor: prevent double logging of NamespacedName across reconcilers (#1379)
Signed-off-by: Ernest Wong <[email protected]>
1 parent 58ac08d commit b11a1f4

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

pkg/epp/controller/inferenceobjective_reconciler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type InferenceObjectiveReconciler struct {
3939
}
4040

4141
func (c *InferenceObjectiveReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
42-
logger := log.FromContext(ctx).V(logutil.DEFAULT).WithValues("InferenceObjective", req.NamespacedName)
42+
logger := log.FromContext(ctx).V(logutil.DEFAULT)
4343
ctx = ctrl.LoggerInto(ctx, logger)
4444

4545
logger.Info("Reconciling InferenceObjective")

pkg/epp/controller/inferencepool_reconciler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ type InferencePoolReconciler struct {
4242
}
4343

4444
func (c *InferencePoolReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
45-
logger := log.FromContext(ctx).WithValues("group", c.PoolGKNN.Group, "inferencePool", req.NamespacedName).V(logutil.DEFAULT)
45+
logger := log.FromContext(ctx).WithValues("group", c.PoolGKNN.Group).V(logutil.DEFAULT)
4646
ctx = ctrl.LoggerInto(ctx, logger)
4747

48-
logger.Info("Reconciling InferencePool", "group", c.PoolGKNN.Group, "inferencePool", req.NamespacedName)
48+
logger.Info("Reconciling InferencePool")
4949

5050
// 1. Initialize a generic client.Object based on the group.
5151
var obj client.Object

pkg/epp/controller/pod_reconciler.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ func (c *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
4747
return ctrl.Result{}, nil
4848
}
4949

50-
logger.V(logutil.VERBOSE).Info("Pod being reconciled", "name", req.NamespacedName)
50+
logger.V(logutil.VERBOSE).Info("Pod being reconciled")
5151

5252
pod := &corev1.Pod{}
5353
if err := c.Get(ctx, req.NamespacedName, pod); err != nil {
5454
if apierrors.IsNotFound(err) {
5555
c.Datastore.PodDelete(req.NamespacedName)
5656
return ctrl.Result{}, nil
5757
}
58-
logger.V(logutil.DEFAULT).Error(err, "Unable to get pod", "name", req.NamespacedName)
58+
logger.V(logutil.DEFAULT).Error(err, "Unable to get pod")
5959
return ctrl.Result{}, err
6060
}
6161

@@ -92,13 +92,13 @@ func (c *PodReconciler) SetupWithManager(mgr ctrl.Manager) error {
9292
func (c *PodReconciler) updateDatastore(logger logr.Logger, pod *corev1.Pod) {
9393
namespacedName := types.NamespacedName{Name: pod.Name, Namespace: pod.Namespace}
9494
if !podutil.IsPodReady(pod) || !c.Datastore.PoolLabelsMatch(pod.Labels) {
95-
logger.V(logutil.DEBUG).Info("Pod removed or not added", "name", namespacedName)
95+
logger.V(logutil.DEBUG).Info("Pod removed or not added")
9696
c.Datastore.PodDelete(namespacedName)
9797
} else {
9898
if c.Datastore.PodUpdateOrAddIfNotExist(pod) {
99-
logger.V(logutil.DEFAULT).Info("Pod added", "name", namespacedName)
99+
logger.V(logutil.DEFAULT).Info("Pod added")
100100
} else {
101-
logger.V(logutil.DEFAULT).Info("Pod already exists", "name", namespacedName)
101+
logger.V(logutil.DEFAULT).Info("Pod already exists")
102102
}
103103
}
104104
}

0 commit comments

Comments
 (0)