Instant reschedule after finalizer added

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

Author: csviri

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

@@ -141,7 +141,8 @@ private PostExecutionControl<P> handleReconcile(
       } else {
         updatedResource = ReconcileUtils.addFinalizer(context);
       }
-      return PostExecutionControl.onlyFinalizerAdded(updatedResource);
+      return PostExecutionControl.onlyFinalizerAdded(updatedResource)
+          .withReSchedule(BaseControl.INSTANT_RESCHEDULE);
     } else {
       try {
         return reconcileExecution(executionScope, resourceForExecution, originalResource, context);

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/timer/TimerEventSource.java

@@ -25,6 +25,7 @@
 import org.slf4j.LoggerFactory;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.javaoperatorsdk.operator.api.reconciler.BaseControl;
 import io.javaoperatorsdk.operator.health.Status;
 import io.javaoperatorsdk.operator.processing.event.Event;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
@@ -62,8 +63,12 @@ public void scheduleOnce(ResourceID resourceID, long delay) {
       cancelOnceSchedule(resourceID);
     }
     EventProducerTimeTask task = new EventProducerTimeTask(resourceID);
-    onceTasks.put(resourceID, task);
-    timer.schedule(task, delay);
+    if (delay == BaseControl.INSTANT_RESCHEDULE) {
+      task.run();
+    } else {
+      onceTasks.put(resourceID, task);
+      timer.schedule(task, delay);
+    }
   }
 
   @Override

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/timer/TimerEventSourceTest.java

@@ -26,6 +26,7 @@
 import org.junit.jupiter.api.Test;
 
 import io.javaoperatorsdk.operator.TestUtils;
+import io.javaoperatorsdk.operator.api.reconciler.BaseControl;
 import io.javaoperatorsdk.operator.health.Status;
 import io.javaoperatorsdk.operator.processing.event.Event;
 import io.javaoperatorsdk.operator.processing.event.EventHandler;
@@ -115,6 +116,15 @@ public void eventNotFiredIfStopped() {
     assertThat(source.getStatus()).isEqualTo(Status.UNHEALTHY);
   }
 
+  @Test
+  public void handlesInstanceReschedule() {
+    var resourceID = ResourceID.fromResource(TestUtils.testCustomResource());
+
+    source.scheduleOnce(resourceID, BaseControl.INSTANT_RESCHEDULE);
+
+    assertThat(eventHandler.events).hasSize(1);
+  }
+
   private void untilAsserted(ThrowingRunnable assertion) {
     untilAsserted(INITIAL_DELAY, PERIOD, assertion);
   }