Merge pull request #643 from oracle/target-namespace2

Check for recently added target namespaces more freequently

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/Main.java

@@ -29,6 +29,7 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
 import oracle.kubernetes.operator.calls.CallResponse;
 import oracle.kubernetes.operator.helpers.CRDHelper;
 import oracle.kubernetes.operator.helpers.CallBuilder;
@@ -57,6 +58,7 @@
 import oracle.kubernetes.operator.work.ThreadFactorySingleton;
 import oracle.kubernetes.weblogic.domain.v2.Domain;
 import oracle.kubernetes.weblogic.domain.v2.DomainList;
+import org.joda.time.DateTime;
 
 /** A Kubernetes Operator for WebLogic. */
 public class Main {
@@ -126,6 +128,8 @@ public Thread newThread(Runnable r) {
   static final Map<String, PodWatcher> podWatchers = new ConcurrentHashMap<>();
 
   private static final String operatorNamespace = getOperatorNamespace();
+  private static final AtomicReference<DateTime> lastFullRecheck =
+      new AtomicReference<>(DateTime.now());
 
   private static String principal;
   private static RestServer restServer = null;
@@ -215,7 +219,7 @@ private static void completeBegin() {
       startRestServer(principal, isNamespaceStopping.keySet());
 
       // start periodic retry and recheck
-      int recheckInterval = tuningAndConfig.getMainTuning().domainPresenceRecheckIntervalSeconds;
+      int recheckInterval = tuningAndConfig.getMainTuning().targetNamespaceRecheckIntervalSeconds;
       engine
           .getExecutor()
           .scheduleWithFixedDelay(
@@ -335,7 +339,17 @@ private static Runnable recheckDomains() {
       namespacesToStop.removeAll(targetNamespaces);
       stopNamespaces(namespacesToStop);
 
-      runSteps(new StartNamespacesStep(targetNamespaces));
+      Collection<String> namespacesToStart = targetNamespaces;
+      int recheckInterval = tuningAndConfig.getMainTuning().domainPresenceRecheckIntervalSeconds;
+      DateTime now = DateTime.now();
+      if (lastFullRecheck.get().plusSeconds(recheckInterval).isBefore(now)) {
+        lastFullRecheck.set(now);
+      } else {
+        namespacesToStart = new TreeSet<>(targetNamespaces);
+        namespacesToStart.removeAll(isNamespaceStarted.keySet());
+      }
+
+      if (!namespacesToStart.isEmpty()) runSteps(new StartNamespacesStep(namespacesToStart));
     };
   }
 

operator/src/main/java/oracle/kubernetes/operator/TuningParameters.java

@@ -22,6 +22,7 @@ public static TuningParameters getInstance() {
   public static class MainTuning {
     public final int domainPresenceFailureRetrySeconds;
     public final int domainPresenceRecheckIntervalSeconds;
+    public final int targetNamespaceRecheckIntervalSeconds;
     public final int statusUpdateTimeoutSeconds;
     public final int unchangedCountToDelayStatusRecheck;
     public final long initialShortDelay;
@@ -30,12 +31,14 @@ public static class MainTuning {
     public MainTuning(
         int domainPresenceFailureRetrySeconds,
         int domainPresenceRecheckIntervalSeconds,
+        int targetNamespaceRecheckIntervalSeconds,
         int statusUpdateTimeoutSeconds,
         int unchangedCountToDelayStatusRecheck,
         long initialShortDelay,
         long eventualLongDelay) {
       this.domainPresenceFailureRetrySeconds = domainPresenceFailureRetrySeconds;
       this.domainPresenceRecheckIntervalSeconds = domainPresenceRecheckIntervalSeconds;
+      this.targetNamespaceRecheckIntervalSeconds = targetNamespaceRecheckIntervalSeconds;
       this.statusUpdateTimeoutSeconds = statusUpdateTimeoutSeconds;
       this.unchangedCountToDelayStatusRecheck = unchangedCountToDelayStatusRecheck;
       this.initialShortDelay = initialShortDelay;

operator/src/main/java/oracle/kubernetes/operator/TuningParametersImpl.java

@@ -53,6 +53,7 @@ private void update() {
         new MainTuning(
             (int) readTuningParameter("domainPresenceFailureRetrySeconds", 10),
             (int) readTuningParameter("domainPresenceRecheckIntervalSeconds", 120),
+            (int) readTuningParameter("targetNamespaceRecheckIntervalSeconds", 3),
             (int) readTuningParameter("statusUpdateTimeoutSeconds", 10),
             (int) readTuningParameter("statusUpdateUnchangedCountToDelayStatusRecheck", 10),
             readTuningParameter("statusUpdateInitialShortDelay", 3),

operator/src/main/java/oracle/kubernetes/operator/helpers/ConfigMapConsumer.java

@@ -4,18 +4,11 @@
 
 package oracle.kubernetes.operator.helpers;
 
-import static java.nio.file.StandardWatchEventKinds.*;
-
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.FileSystems;
 import java.nio.file.Files;
-import java.nio.file.WatchEvent;
-import java.nio.file.WatchKey;
-import java.nio.file.WatchService;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
@@ -35,7 +28,6 @@ public class ConfigMapConsumer implements Map<String, String> {
   private static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
 
   private final File mountPointDir;
-  private final WatchService watcher;
   private final ScheduledExecutorService threadPool;
   private final AtomicReference<ScheduledFuture<?>> future = new AtomicReference<>(null);
   private final Runnable onUpdate;
@@ -45,10 +37,8 @@ public ConfigMapConsumer(
       throws IOException {
     this.threadPool = executorService;
     this.mountPointDir = new File(mountPoint);
-    this.watcher = FileSystems.getDefault().newWatchService();
     this.onUpdate = onUpdate;
     if (mountPointDir.exists()) {
-      mountPointDir.toPath().register(watcher, ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY);
       schedule();
     }
   }
@@ -60,20 +50,7 @@ private void schedule() {
         future.getAndSet(
             threadPool.scheduleWithFixedDelay(
                 () -> {
-                  // wait for key to be signaled
-                  WatchKey key;
-                  try {
-                    key = watcher.take();
-                  } catch (InterruptedException x) {
-                    return;
-                  }
-                  List<WatchEvent<?>> events = key.pollEvents();
-                  if (events != null && !events.isEmpty()) {
-                    onUpdate.run();
-                    schedule();
-                    return;
-                  }
-                  key.reset();
+                  onUpdate.run();
                 },
                 initialDelay,
                 delay,