fix: also close handler and wait a little for tasks to finish

Author: metacosm

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

@@ -22,6 +22,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -75,12 +76,12 @@ public DefaultEventHandler(
 
   @Override
   public void close() {
-    if (eventSourceManager != null) {
-      log.debug("Closing EventSourceManager {} -> {}", controllerName, eventSourceManager);
-      eventSourceManager.close();
+    try {
+      log.debug("Closing handler for {}", controllerName);
+      executor.awaitTermination(10, TimeUnit.SECONDS);
+    } catch (InterruptedException e) {
+      log.debug("Exception closing handler for {}: {}", controllerName, e.getLocalizedMessage());
     }
-
-    executor.shutdownNow();
   }
 
   public void setEventSourceManager(DefaultEventSourceManager eventSourceManager) {

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

@@ -79,9 +79,10 @@ public void start() {
 
   @Override
   public void close() {
+    eventHandler.close();
     for (Watch watch : this.watches) {
       try {
-        log.debug("Closing watch {} -> {}", resClass, watch);
+        log.info("Closing watch {} -> {}", resClass, watch);
         watch.close();
       } catch (Exception e) {
         log.warn("Error closing watcher {} -> {}", resClass, watch, e);