wip

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java

@@ -342,11 +342,13 @@ private PostExecutionControl<P> handleCleanup(
   }
 
   private P patchResource(Context<P> context, P resource, P originalResource, boolean filterEvent) {
-    log.debug(
-        "Updating resource: {} with version: {}; SSA: {}",
-        getUID(resource),
-        getVersion(resource),
-        useSSA);
+    if (log.isDebugEnabled()) {
+      log.debug(
+          "Updating resource: {} with version: {}; SSA: {}",
+          resource.getMetadata().getName(),
+          getVersion(resource),
+          useSSA);
+    }
     log.trace("Resource before update: {}", resource);
 
     final var finalizerName = configuration().getFinalizerName();

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/TemporaryResourceCache.java

@@ -105,15 +105,22 @@ public boolean onAddOrUpdateEvent(T resource) {
 
   private boolean onEvent(T resource, boolean unknownState) {
     var resourceId = ResourceID.fromResource(resource);
+    // todo move to trace these log messages
+    log.debug(
+        "Processing event for resource id: {} version: {} ",
+        resourceId,
+        resource.getMetadata().getResourceVersion());
     ReentrantLock lock = activelyModifying.get(resourceId);
     if (lock != null) {
+      log.debug("Lock for event filtering resource id: {}", resourceId);
       // note that this is a special case of lock striping; event handling happens
       // always on the same thread of the informer we lock only if the update is happening
       // for the same resource (not any resource), and if the event comes from the current update
       // this should be locked for a very short time, since that update request already send at this
       // point.
       lock.lock(); // wait for the modification to finish
       lock.unlock(); // simply unlock as the event is guaranteed after the modification
+      log.debug("Unlock for event resource id: {}", resourceId);
     }
     boolean[] filter = new boolean[1];
     synchronized (this) {

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/patchresourcewithssa/PatchResourceWithSSAReconciler.java

@@ -41,7 +41,8 @@ public UpdateControl<PatchResourceWithSSACustomResource> reconcile(
     if (resource.getSpec().getControllerManagedValue() == null) {
       res.setSpec(new PatchResourceWithSSASpec());
       res.getSpec().setControllerManagedValue(ADDED_VALUE);
-      return UpdateControl.patchResource(res);
+      // test assumes we will run this in the next reconciliation
+      return UpdateControl.patchResource(res).filterPatchEvent(false);
     } else {
       res.setStatus(new PatchResourceWithSSAStatus());
       res.getStatus().setSuccessfullyReconciled(true);

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/patchresourcewithssa/PatchWithSSAITBase.java

@@ -49,6 +49,7 @@ void reconcilerPatchesResourceWithSSA() {
                   .isEqualTo(PatchResourceWithSSAReconciler.ADDED_VALUE);
               // finalizer is added to the SSA patch in the background by the framework
               assertThat(actualResource.getMetadata().getFinalizers()).isNotEmpty();
+              assertThat(actualResource.getStatus()).isNotNull();
               assertThat(actualResource.getStatus().isSuccessfullyReconciled()).isTrue();
               // one for resource, one for subresource
               assertThat(