From 6769e68af15fdccab9efa0ce440181b315a94496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Mon, 4 Mar 2024 14:35:08 +0100 Subject: [PATCH 1/2] improve: logging for tracing issues with events MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../event/ReconciliationDispatcher.java | 23 +++++++++++-------- .../ControllerResourceEventSource.java | 11 ++++++--- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java index a03ab8b399..54a4978902 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java @@ -285,11 +285,12 @@ private void updatePostExecutionControlWithReschedule( private PostExecutionControl

handleCleanup(P resource, Context

context) { - log.debug( - "Executing delete for resource: {} with version: {}", - getName(resource), - getVersion(resource)); - + if (log.isDebugEnabled()) { + log.debug( + "Executing delete for resource: {} with version: {}", + ResourceID.fromResource(resource), + getVersion(resource)); + } DeleteControl deleteControl = controller.cleanup(resource, context); final var useFinalizer = controller.useFinalizer(); if (useFinalizer) { @@ -345,7 +346,7 @@ ControllerConfiguration

configuration() { public P conflictRetryingUpdate(P resource, Function modificationFunction) { if (log.isDebugEnabled()) { - log.debug("Removing finalizer on resource: {}", ResourceID.fromResource(resource)); + log.debug("Conflict retying update for: {}", ResourceID.fromResource(resource)); } int retryIndex = 0; while (true) { @@ -393,10 +394,12 @@ public R getResource(String namespace, String name) { } public R updateResource(R resource) { - log.debug( - "Trying to replace resource {}, version: {}", - getName(resource), - resource.getMetadata().getResourceVersion()); + if (log.isDebugEnabled()) { + log.debug( + "Trying to replace resource {}, version: {}", + ResourceID.fromResource(resource), + resource.getMetadata().getResourceVersion()); + } return resource(resource).lockResourceVersion(resource.getMetadata().getResourceVersion()) .update(); } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java index 5aa05f146c..c1ac2d3352 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java @@ -66,7 +66,12 @@ public synchronized void start() { public void eventReceived(ResourceAction action, T resource, T oldResource) { try { - log.debug("Event received for resource: {}", getName(resource)); + if (log.isDebugEnabled()) { + log.debug("Event received for resource: {} version: {} uuid: {} action: {}", + ResourceID.fromResource(resource), + getVersion(resource), resource.getMetadata().getUid(), action); + log.trace("Event Old resource: {},\n new resource: {}", oldResource, resource); + } MDCUtils.addResourceInfo(resource); controller.getEventSourceManager().broadcastOnResourceEvent(action, resource, oldResource); if ((legacyFilters == null || @@ -75,8 +80,8 @@ && isAcceptedByFilters(action, resource, oldResource)) { getEventHandler().handleEvent( new ResourceEvent(action, ResourceID.fromResource(resource), resource)); } else { - log.debug("Skipping event handling resource {} with version: {}", getUID(resource), - getVersion(resource)); + log.debug("Skipping event handling resource {}", + ResourceID.fromResource(resource)); } } finally { MDCUtils.removeResourceInfo(); From 20b39ca8f249bbaf9c6b465f5d4bbeb32bb1580b Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Mon, 4 Mar 2024 17:00:30 +0100 Subject: [PATCH 2/2] fix: typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../operator/processing/event/ReconciliationDispatcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java index 54a4978902..cd1d601487 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java @@ -346,7 +346,7 @@ ControllerConfiguration

configuration() { public P conflictRetryingUpdate(P resource, Function modificationFunction) { if (log.isDebugEnabled()) { - log.debug("Conflict retying update for: {}", ResourceID.fromResource(resource)); + log.debug("Conflict retrying update for: {}", ResourceID.fromResource(resource)); } int retryIndex = 0; while (true) {