logging

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

Author: csviri

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

@@ -7,7 +7,7 @@
 
 public interface ComplementaryPrimaryToSecondaryIndex<R extends HasMetadata> {
 
-  void explicitAdd(R resource);
+  void explicitAddOrUpdate(R resource);
 
   void cleanupForResource(R resourceID);
 

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

@@ -21,7 +21,7 @@ public DefaultComplementaryPrimaryToSecondaryIndex(
   }
 
   @Override
-  public void explicitAdd(R resource) {
+  public void explicitAddOrUpdate(R resource) {
     Set<ResourceID> primaryResources = secondaryToPrimaryMapper.toPrimaryResourceIDs(resource);
     primaryResources.forEach(
         primaryResource -> {

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

@@ -257,14 +257,15 @@ public Set<R> getSecondaryResources(P primary) {
     if (useSecondaryToPrimaryIndex()) {
       var primaryID = ResourceID.fromResource(primary);
       var resources = byIndex(PRIMARY_TO_SECONDARY_INDEX_NAME, resourceIdToString(primaryID));
-
+      log.debug("Resources in cache: {}", resources);
       log.debug(
           "Using informer primary to secondary index to find secondary resources for primary name:"
               + " {} namespace: {}. Found {}",
           primary.getMetadata().getName(),
           primary.getMetadata().getNamespace(),
           resources.size());
       var complementaryIds = complementaryPrimaryToSecondaryIndex.getSecondaryResources(primaryID);
+      log.debug("Complementary ids: {}", complementaryIds);
       var res =
           resources.stream()
               .map(
@@ -278,7 +279,7 @@ public Set<R> getSecondaryResources(P primary) {
       complementaryIds.forEach(
           id -> {
             Optional<R> resource = get(id);
-            resource.ifPresent(res::add);
+            resource.ifPresentOrElse(res::add, () -> log.debug("Resource not found: {}", id));
           });
       return res;
     } else {
@@ -307,7 +308,7 @@ public synchronized void handleRecentResourceCreate(ResourceID resourceID, R res
   }
 
   private void handleRecentCreateOrUpdate(Operation operation, R newResource, R oldResource) {
-    complementaryPrimaryToSecondaryIndex.explicitAdd(newResource);
+    complementaryPrimaryToSecondaryIndex.explicitAddOrUpdate(newResource);
     temporaryResourceCache.putResource(
         newResource,
         Optional.ofNullable(oldResource)

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

@@ -9,7 +9,7 @@ public class NOOPComplementaryPrimaryToSecondaryIndex<R extends HasMetadata>
     implements ComplementaryPrimaryToSecondaryIndex<R> {
 
   @Override
-  public void explicitAdd(R resource) {}
+  public void explicitAddOrUpdate(R resource) {}
 
   @Override
   public void cleanupForResource(R resourceID) {}

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/DefaultComplementaryPrimaryToSecondaryIndexTest.java

@@ -48,7 +48,7 @@ void returnsEmptySetOnEmptyIndex() {
 
   @Test
   void indexesNewResources() {
-    primaryToSecondaryIndex.explicitAdd(secondary1);
+    primaryToSecondaryIndex.explicitAddOrUpdate(secondary1);
 
     var secondaryResources1 = primaryToSecondaryIndex.getSecondaryResources(primaryID1);
     var secondaryResources2 = primaryToSecondaryIndex.getSecondaryResources(primaryID2);
@@ -59,8 +59,8 @@ void indexesNewResources() {
 
   @Test
   void indexesAdditionalResources() {
-    primaryToSecondaryIndex.explicitAdd(secondary1);
-    primaryToSecondaryIndex.explicitAdd(secondary2);
+    primaryToSecondaryIndex.explicitAddOrUpdate(secondary1);
+    primaryToSecondaryIndex.explicitAddOrUpdate(secondary2);
 
     var secondaryResources1 = primaryToSecondaryIndex.getSecondaryResources(primaryID1);
     var secondaryResources2 = primaryToSecondaryIndex.getSecondaryResources(primaryID2);
@@ -73,8 +73,8 @@ void indexesAdditionalResources() {
 
   @Test
   void removingResourceFromIndex() {
-    primaryToSecondaryIndex.explicitAdd(secondary1);
-    primaryToSecondaryIndex.explicitAdd(secondary2);
+    primaryToSecondaryIndex.explicitAddOrUpdate(secondary1);
+    primaryToSecondaryIndex.explicitAddOrUpdate(secondary2);
     primaryToSecondaryIndex.cleanupForResource(secondary1);
 
     var secondaryResources1 = primaryToSecondaryIndex.getSecondaryResources(primaryID1);
@@ -106,7 +106,7 @@ public Set<ResourceID> toPrimaryResourceIDs(HasMetadata resource) {
             });
     var start = LocalDateTime.now();
     for (int i = 0; i < 1_000_000; i++) {
-      primaryToSecondaryIndex.explicitAdd(cm(i));
+      primaryToSecondaryIndex.explicitAddOrUpdate(cm(i));
     }
     System.out.println(ChronoUnit.MILLIS.between(start, LocalDateTime.now()));