event scheduler improvements

Author: csviri

operator-framework/src/main/java/com/github/containersolutions/operator/processing/CustomResourceEvent.java

@@ -10,7 +10,9 @@
 import java.util.Optional;
 
 class CustomResourceEvent {
+
     public static final int MAX_RETRY_COUNT = 5;
+
     private final static Logger log = LoggerFactory.getLogger(CustomResourceEvent.class);
 
     private final static BackOffExecution backOff = new ExponentialBackOff(2000L, 1.5).start();
@@ -79,8 +81,8 @@ public String toString() {
         return "CustomResourceEvent{" +
                 "action=" + action +
                 ", resource=[ name=" + resource.getMetadata().getName() + ", kind=" + resource.getKind() +
-                ", apiVersion=" + resource.getApiVersion() + "]" +
-                ", retriesIndex=" + retryIndex +
+                ", apiVersion=" + resource.getApiVersion() + " ,resourceVersion=" + resource.getMetadata().getResourceVersion() +
+                " ], retriesIndex=" + retryIndex +
                 '}';
     }
 }

operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventScheduler.java

@@ -103,12 +103,12 @@ void scheduleEvent(CustomResourceEvent newEvent) {
                 ScheduledFuture<?> scheduledFuture = scheduleHolder.getScheduledFuture();
                 // If newEvent is older than existing in queue, don't schedule and remove from cache
                 if (scheduledEvent.isSameResourceAndNewerVersion(newEvent)) {
-                    log.debug("Incoming event discarded because queued event is newer. {}", newEvent);
+                    log.debug("Incoming event discarded because already scheduled event is newer. {}", newEvent);
                     return;
                 }
                 // If newEvent is newer than existing in queue, cancel and remove queuedEvent
                 if (newEvent.isSameResourceAndNewerVersion(scheduledEvent)) {
-                    log.debug("Queued event canceled because incoming event is newer. {}", scheduledEvent);
+                    log.debug("Scheduled event canceled because incoming event is newer. {}", scheduledEvent);
                     scheduledFuture.cancel(false);
                     eventStore.removeEventScheduledForProcessing(scheduledEvent.resourceUid());
                 }