Backport OWLS-80884 fix to not stop pods no longer managed by this operator

Author: rjeberhard

docs/charts/index.yaml

@@ -2,83 +2,83 @@ apiVersion: v1
 entries:
   weblogic-operator:
   - apiVersion: v1
-    created: "2020-06-01T11:06:47.01222-04:00"
+    created: "2020-06-19T15:05:15.882687-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 5f4cd8f4f3282b52b5e90a1169f26986e8272671845053606ade9c855fb04151
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.0-rc1.tgz
     version: 3.0.0-rc1
   - apiVersion: v1
-    created: "2020-06-01T11:06:47.009924-04:00"
+    created: "2020-06-19T15:05:15.880744-04:00"
     description: Helm chart for configuring the WebLogic operator.
-    digest: 90cce593163ff508ccfe1e00046d2bd7f0ea28b2403812e427f3d6fed473771e
+    digest: d441888a8deae1b1339e7585e3b437dfd2533303e46e842d7378e16db665e234
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.6.0.tgz
     version: 2.6.0
   - apiVersion: v1
-    created: "2020-06-01T11:06:46.996245-04:00"
+    created: "2020-06-19T15:05:15.875847-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: fe41421b7dc45dc8a3b2888d3a626a37f5d3c8e1fa292fb6699deedc5e1db33d
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.5.0.tgz
     version: 2.5.0
   - apiVersion: v1
-    created: "2020-06-01T11:06:46.984232-04:00"
+    created: "2020-06-19T15:05:15.874044-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: b36bd32083f67453a62d089a2c09ce38e6655d88ac8a7b38691230c55c40e672
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.4.0.tgz
     version: 2.4.0
   - apiVersion: v1
-    created: "2020-06-01T11:06:46.957724-04:00"
+    created: "2020-06-19T15:05:15.872291-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: a3eafe4c2c6ff49384e56421201e59a3737d651af8d5b605b87a19eb1f6f1dc3
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.1.tgz
     version: 2.3.1
   - apiVersion: v1
-    created: "2020-06-01T11:06:46.91045-04:00"
+    created: "2020-06-19T15:05:15.868706-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: cbc6caaa6eb28e3c7e906ede14b2ae511a0b35fc12a8e3ab629155b09993e8b2
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.0.tgz
     version: 2.3.0
   - apiVersion: v1
-    created: "2020-06-01T11:06:46.888509-04:00"
+    created: "2020-06-19T15:05:15.866966-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 23d5a1c554fa8211cc1e86b7ade09460917cb2069e68fb4bfdddafc8db44fdcd
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.1.tgz
     version: 2.2.1
   - apiVersion: v1
-    created: "2020-06-01T11:06:46.885035-04:00"
+    created: "2020-06-19T15:05:15.865414-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: bba303686cb55d84fe8c0d693a2436e7e686b028085b56e012f6381699a3911f
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.0.tgz
     version: 2.2.0
   - apiVersion: v1
-    created: "2020-06-01T11:06:46.879707-04:00"
+    created: "2020-06-19T15:05:15.862974-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 391e23c0969ada5f0cd2a088ddc6f11f237f57521801ed3925db2149a8437a0d
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.1.tgz
     version: "2.1"
   - apiVersion: v1
-    created: "2020-06-01T11:06:46.872459-04:00"
+    created: "2020-06-19T15:05:15.861136-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 298acda78ab73db6b7ba6f2752311bfa40c65874e03fb196b70976192211c1a5
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.0.1.tgz
     version: 2.0.1
-generated: "2020-06-01T11:06:46.867346-04:00"
+generated: "2020-06-19T15:05:15.857696-04:00"

docs/charts/weblogic-operator-2.6.0.tgz

@@ -86,7 +86,7 @@ public class Main {
   private static final TuningParameters tuningAndConfig;
   private static final CallBuilderFactory callBuilderFactory = new CallBuilderFactory();
   private static Map<String, NamespaceStatus> namespaceStatuses = new ConcurrentHashMap<>();
-  private static Map<String, AtomicBoolean> isNamespaceStopping = new ConcurrentHashMap<>();
+  private static Map<String, AtomicBoolean> namespaceStoppingMap = new ConcurrentHashMap<>();
   private static final Map<String, ConfigMapWatcher> configMapWatchers = new ConcurrentHashMap<>();
   private static final Map<String, DomainWatcher> domainWatchers = new ConcurrentHashMap<>();
   private static final Map<String, EventWatcher> eventWatchers = new ConcurrentHashMap<>();
@@ -227,7 +227,7 @@ private static void begin() {
   private static void completeBegin() {
     try {
       // start the REST server
-      startRestServer(principal, isNamespaceStopping.keySet());
+      startRestServer(principal, namespaceStoppingMap.keySet());
 
       // start periodic retry and recheck
       int recheckInterval = tuningAndConfig.getMainTuning().targetNamespaceRecheckIntervalSeconds;
@@ -247,14 +247,23 @@ private static void completeBegin() {
     }
   }
 
-  private static void stopNamespace(String ns, boolean remove) {
-    processor.stopNamespace(ns);
-    AtomicBoolean stopping =
-        remove ? isNamespaceStopping.remove(ns) : isNamespaceStopping.get(ns);
+  private static void stopNamespace(String ns, boolean inTargetNamespaceList) {
+    AtomicBoolean isNamespaceStopping = isNamespaceStopping(ns);
 
-    if (stopping != null) {
-      stopping.set(true);
+    // Remove if namespace not in targetNamespace list
+    if (!inTargetNamespaceList) {
+      namespaceStoppingMap.remove(ns);
     }
+
+    // stop all Domains for namespace being stopped (not active)
+    if (isNamespaceStopping.get()) {
+      processor.stopNamespace(ns);
+    }
+
+    // set flag to indicate namespace is stopping.
+    isNamespaceStopping.set(true);
+
+    // unsubscribe from resource events for given namespace
     namespaceStatuses.remove(ns);
     domainWatchers.remove(ns);
     eventWatchers.remove(ns);
@@ -267,12 +276,12 @@ private static void stopNamespace(String ns, boolean remove) {
   private static void stopNamespaces(Collection<String> targetNamespaces,
                                      Collection<String> namespacesToStop) {
     for (String ns : namespacesToStop) {
-      stopNamespace(ns, (! targetNamespaces.contains(ns)));
+      stopNamespace(ns, targetNamespaces.contains(ns));
     }
   }
 
   private static AtomicBoolean isNamespaceStopping(String ns) {
-    return isNamespaceStopping.computeIfAbsent(ns, (key) -> new AtomicBoolean(false));
+    return namespaceStoppingMap.computeIfAbsent(ns, (key) -> new AtomicBoolean(false));
   }
 
   private static void runSteps(Step firstStep) {
@@ -294,7 +303,7 @@ static Runnable recheckDomains() {
 
       // Check for namespaces that are removed from the operator's
       // targetNamespaces list, or that are deleted from the Kubernetes cluster.
-      Set<String> namespacesToStop = new TreeSet<>(isNamespaceStopping.keySet());
+      Set<String> namespacesToStop = new TreeSet<>(namespaceStoppingMap.keySet());
       for (String ns : targetNamespaces) {
         // the active namespaces are the ones that will not be stopped
         if (delegate.isNamespaceRunning(ns)) {
@@ -403,7 +412,7 @@ private static Collection<String> getTargetNamespaces() {
     return isDedicated()
         ? Collections.singleton(operatorNamespace)
         : getTargetNamespaces(Optional.ofNullable(getHelmVariable.apply("OPERATOR_TARGET_NAMESPACES"))
-            .orElse(tuningAndConfig.get("targetNamespaces")), operatorNamespace);
+        .orElse(tuningAndConfig.get("targetNamespaces")), operatorNamespace);
   }
 
   public static boolean isDedicated() {
@@ -450,7 +459,7 @@ private static void waitForDeath() {
       Thread.currentThread().interrupt();
     }
 
-    isNamespaceStopping.forEach((key, value) -> value.set(true));
+    namespaceStoppingMap.forEach((key, value) -> value.set(true));
   }
 
   private static EventWatcher createEventWatcher(String ns, String initialResourceVersion) {
@@ -528,15 +537,15 @@ private static void dispatchNamespaceWatch(Watch.Response<V1Namespace> item) {
             runSteps(Step.chain(
                 ConfigMapHelper.createScriptConfigMapStep(operatorNamespace, ns),
                 createConfigMapStep(ns)));
-            isNamespaceStopping.put(ns, new AtomicBoolean(false));
+            namespaceStoppingMap.put(ns, new AtomicBoolean(false));
           }
           break;
 
         case "DELETED":
           // Mark the namespace as isStopping, which will cause the namespace be stopped
           // the next time when recheckDomains is triggered
           if (delegate.isNamespaceRunning(ns)) {
-            isNamespaceStopping.put(ns, new AtomicBoolean(true));
+            namespaceStoppingMap.put(ns, new AtomicBoolean(true));
           }
 
           break;
@@ -904,17 +913,17 @@ public NextAction onSuccess(Packet packet, CallResponse<V1NamespaceList> callRes
       Step strategy = null;
       if (!namespacesToStart.isEmpty()) {
         strategy = Step.chain(createDomainCrdAndStartNamespaces(namespacesToStart),
-                new CreateNamespaceWatcherStep(intialResourceVersion));
+            new CreateNamespaceWatcherStep(intialResourceVersion));
       } else {
         strategy = CrdHelper.createDomainCrdStep(version,
-                new CreateNamespaceWatcherStep(intialResourceVersion));
+            new CreateNamespaceWatcherStep(intialResourceVersion));
       }
       return doNext(strategy, packet);
     }
 
     private Step createDomainCrdAndStartNamespaces(Collection<String> namespacesToStart) {
       return CrdHelper.createDomainCrdStep(version,
-              new StartNamespacesStep(namespacesToStart, false));
+          new StartNamespacesStep(namespacesToStart, false));
     }
 
     private String getInitialResourceVersion(V1NamespaceList result) {
@@ -991,7 +1000,7 @@ public boolean isNamespaceRunning(String namespace) {
       // make sure the map entry is initialized the value to "false" if absent
       isNamespaceStopping(namespace);
 
-      return !isNamespaceStopping.get(namespace).get();
+      return !namespaceStoppingMap.get(namespace).get();
     }
 
     @Override

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

@@ -52,7 +52,7 @@ public class DomainPresenceTest extends ThreadFactoryTestBase {
 
   private List<Memento> mementos = new ArrayList<>();
   private KubernetesTestSupport testSupport = new KubernetesTestSupport();
-  private Map<String, AtomicBoolean> isNamespaceStopping;
+  private Map<String, AtomicBoolean> namespaceStoppingMap;
 
   private static Memento installStub(Class<?> containingClass, String fieldName, Object newValue)
       throws NoSuchFieldException {
@@ -73,12 +73,12 @@ public void setUp() throws Exception {
     mementos.add(StaticStubSupport.install(Main.class, "engine", testSupport.getEngine()));
     testSupport.addContainerComponent("TF", ThreadFactory.class, this);
 
-    isNamespaceStopping = getStoppingVariable();
-    isNamespaceStopping.computeIfAbsent(NS, k -> new AtomicBoolean(true)).set(true);
+    namespaceStoppingMap = getStoppingVariable();
+    namespaceStoppingMap.computeIfAbsent(NS, k -> new AtomicBoolean(true)).set(true);
   }
 
   private Map<String, AtomicBoolean> getStoppingVariable() throws NoSuchFieldException {
-    Memento stoppingMemento = StaticStubSupport.preserve(Main.class, "isNamespaceStopping");
+    Memento stoppingMemento = StaticStubSupport.preserve(Main.class, "namespaceStoppingMap");
     return stoppingMemento.getOriginalValue();
   }
 
@@ -88,7 +88,7 @@ private Map<String, AtomicBoolean> getStoppingVariable() throws NoSuchFieldExcep
    */
   @After
   public void tearDown() throws Exception {
-    isNamespaceStopping.computeIfAbsent(NS, k -> new AtomicBoolean(true)).set(true);
+    namespaceStoppingMap.computeIfAbsent(NS, k -> new AtomicBoolean(true)).set(true);
     shutDownThreads();
 
     for (Memento memento : mementos) {
@@ -233,7 +233,7 @@ public void whenStrandedResourcesExist_removeThem() {
         new V1PersistentVolumeClaim().metadata(createMetadata(UID, NS, "claim1"));
     testSupport.defineResources(service1, service2, volume, claim);
 
-    isNamespaceStopping.get(NS).set(false);
+    namespaceStoppingMap.get(NS).set(false);
 
     readExistingResources();