Merge remote-tracking branch 'origin/develop' into OWLS-68700

Author: swapnanitin

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

@@ -577,8 +577,9 @@ private static void doCheckAndCreateDomainPresence(
     // Has the spec actually changed? We will get watch events for status updates
     Domain current = info.getDomain();
     if (existingDomain && current != null) {
-      if (!explicitRecheck && !hasExplicitRestarts && spec.equals(current.getSpec())) {
-        // nothing in the spec has changed
+      if (isOlderResourceVersion(current, dom)
+          || (!explicitRecheck && !hasExplicitRestarts && spec.equals(current.getSpec()))) {
+        // nothing in the spec has changed or we received an outdated watch event
         LOGGER.fine(MessageKeys.NOT_STARTING_DOMAINUID_THREAD, domainUID);
         return;
       }
@@ -660,6 +661,11 @@ public void onThrowable(Packet packet, Throwable throwable) {
     LOGGER.exiting();
   }
 
+  static boolean isOlderResourceVersion(Domain current, Domain dom) {
+    return Integer.parseInt(dom.getMetadata().getResourceVersion())
+        < Integer.parseInt(current.getMetadata().getResourceVersion());
+  }
+
   static Step.StepAndPacket createDomainUpPlan(DomainPresenceInfo info, String ns) {
     PodWatcher pw = podWatchers.get(ns);
     Step managedServerStrategy =

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

@@ -15,5 +15,5 @@ public class Workarounds {
   // This breaks some K8s model comparisons.
 
   // Reported to https://github.com/kubernetes-client/java as issue #282
-  public static final boolean INTORSTRING_BAD_EQUALS = true;
+  public static final boolean INTORSTRING_BAD_EQUALS = false;
 }

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

@@ -417,8 +417,10 @@ public Set<Entry<String, ServerKubernetesObjects>> entrySet() {
     @Override
     public ServerKubernetesObjects putIfAbsent(String key, ServerKubernetesObjects value) {
       ServerKubernetesObjects result = delegate.putIfAbsent(key, value);
+      DomainPresenceMonitor.putIfAbsent(key, result);
       if (result == null) {
         Domain d = domain.get();
+        DomainPresenceMonitor.putIfAbsentDomain(d);
         if (d != null) {
           ServerKubernetesObjectsManager.register(d.getSpec().getDomainUID(), key, value);
         }

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

@@ -0,0 +1,54 @@
+// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at
+// http://oss.oracle.com/licenses/upl.
+
+package oracle.kubernetes.operator.helpers;
+
+import oracle.kubernetes.weblogic.domain.v2.Domain;
+
+class DomainPresenceMonitor {
+
+  private static String serverNameAsKey;
+  private static ServerKubernetesObjects result;
+  private static Domain domain;
+  private static String registeredName;
+  private static String unregisteredName;
+
+  static void clear() {
+    serverNameAsKey = null;
+    domain = null;
+    registeredName = null;
+  }
+
+  static String getExplanation() {
+    StringBuilder sb = new StringBuilder();
+    if (serverNameAsKey != null)
+      format(sb, "putIfAbsent called with %s and returned %s", serverNameAsKey, result);
+    if (domain != null) format(sb, "Domain was not null");
+    if (registeredName != null) format(sb, "registered with key %s", registeredName);
+    if (unregisteredName != null) format(sb, "unregistered with key %s", unregisteredName);
+
+    return sb.toString();
+  }
+
+  private static void format(StringBuilder sb, String pattern, Object... values) {
+    sb.append(String.format(pattern, values)).append("\n");
+  }
+
+  static void putIfAbsent(String key, ServerKubernetesObjects result) {
+    DomainPresenceMonitor.serverNameAsKey = key;
+    DomainPresenceMonitor.result = result;
+  }
+
+  static void putIfAbsentDomain(Domain domain) {
+    DomainPresenceMonitor.domain = domain;
+  }
+
+  static void registered(String registeredName) {
+    DomainPresenceMonitor.registeredName = registeredName;
+  }
+
+  static void unregistered(String unregisteredName) {
+    DomainPresenceMonitor.unregisteredName = unregisteredName;
+  }
+}

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

@@ -12,7 +12,6 @@
 import static oracle.kubernetes.operator.LabelConstants.DOMAINUID_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.RESOURCE_VERSION_LABEL;
 import static oracle.kubernetes.operator.VersionConstants.DEFAULT_DOMAIN_VERSION;
-import static oracle.kubernetes.operator.Workarounds.INTORSTRING_BAD_EQUALS;
 
 import io.kubernetes.client.custom.IntOrString;
 import io.kubernetes.client.models.V1ObjectMeta;
@@ -31,7 +30,6 @@
 import oracle.kubernetes.operator.work.NextAction;
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.Step;
-import org.yaml.snakeyaml.Yaml;
 
 /** Helper class to add/remove server from Ingress. */
 public class IngressHelper {
@@ -123,21 +121,7 @@ Step replaceIngressStep(Step next) {
 
       private boolean isCompatible(V1beta1Ingress result) {
         return VersionHelper.matchesResourceVersion(result.getMetadata(), DEFAULT_DOMAIN_VERSION)
-            && equalObjects(result.getSpec(), createIngressSpec());
-      }
-
-      private boolean equalObjects(V1beta1IngressSpec object1, V1beta1IngressSpec object2) {
-        return INTORSTRING_BAD_EQUALS
-            ? yamlEquals(object1, object2)
-            : Objects.equals(object1, object2);
-      }
-
-      private boolean yamlEquals(Object actual, Object expected) {
-        return Objects.equals(objectToYaml(actual), objectToYaml(expected));
-      }
-
-      private String objectToYaml(Object object) {
-        return new Yaml().dump(object);
+            && Objects.equals(result.getSpec(), createIngressSpec());
       }
     }
 

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

@@ -14,6 +14,10 @@ public class ServerKubernetesObjectsManager {
 
   private ServerKubernetesObjectsManager() {}
 
+  static void clear() {
+    serverMap.clear();
+  }
+
   static ServerKubernetesObjects getOrCreate(DomainPresenceInfo info, String serverName) {
     return getOrCreate(info, info.getDomain().getSpec().getDomainUID(), serverName);
   }
@@ -30,10 +34,12 @@ public static ServerKubernetesObjects lookup(String serverLegalName) {
   }
 
   static void register(String domainUID, String serverName, ServerKubernetesObjects sko) {
+    DomainPresenceMonitor.registered(serverName);
     serverMap.put(LegalNames.toServerName(domainUID, serverName), sko);
   }
 
   static void unregister(String domainUID, String serverName) {
+    DomainPresenceMonitor.unregistered(serverName);
     serverMap.remove(LegalNames.toServerName(domainUID, serverName));
   }
 

operator/src/test/java/oracle/kubernetes/operator/helpers/CallTestSupport.java

@@ -4,13 +4,10 @@
 
 package oracle.kubernetes.operator.helpers;
 
-import static oracle.kubernetes.operator.Workarounds.INTORSTRING_BAD_EQUALS;
-
 import com.meterware.simplestub.Memento;
 import com.meterware.simplestub.StaticStubSupport;
 import io.kubernetes.client.ApiClient;
 import io.kubernetes.client.ApiException;
-import io.kubernetes.client.models.V1beta1Ingress;
 import java.net.HttpURLConnection;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -24,7 +21,6 @@
 import oracle.kubernetes.operator.calls.RequestParams;
 import oracle.kubernetes.operator.calls.SynchronousCallDispatcher;
 import oracle.kubernetes.operator.calls.SynchronousCallFactory;
-import oracle.kubernetes.operator.utils.YamlUtils;
 
 /**
  * Support for writing unit tests that use CallBuilder to send requests that expect responses.
@@ -163,31 +159,10 @@ private boolean matches(RequestParams requestParams) {
 
     private boolean matchesBody(Object actualBody, Object expectedBody) {
       return expectedBody instanceof BodyMatcher && ((BodyMatcher) expectedBody).matches(actualBody)
-          || equalBodies(actualBody, expectedBody)
+          || Objects.equals(actualBody, expectedBody)
           || function != null;
     }
 
-    private static boolean equalBodies(Object actual, Object expected) {
-      return useYamlComparison(actual)
-          ? yamlEquals(actual, expected)
-          : Objects.equals(actual, expected);
-    }
-
-    // This is a hack to get around a bug in the 1.0 K8s client code:
-    //    the IntOrString class does not define equals(), meaning that any classes which depend on
-    //    it require special handling.
-    private static boolean useYamlComparison(Object actual) {
-      return INTORSTRING_BAD_EQUALS && actual instanceof V1beta1Ingress;
-    }
-
-    private static boolean yamlEquals(Object actual, Object expected) {
-      return Objects.equals(objectToYaml(actual), objectToYaml(expected));
-    }
-
-    private static String objectToYaml(Object object) {
-      return YamlUtils.newYaml().dump(object);
-    }
-
     private boolean matches(AdditionalParams params) {
       return Objects.equals(params.fieldSelector, requestParamExpectations.get(FIELD_SELECTOR))
           && Objects.equals(params.labelSelector, requestParamExpectations.get(LABEL_SELECTOR));

operator/src/test/java/oracle/kubernetes/operator/helpers/ServerKubernetesObjectsLookupTest.java

@@ -16,18 +16,41 @@
 import io.kubernetes.client.models.V1ObjectMeta;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import oracle.kubernetes.TestUtils;
 import oracle.kubernetes.weblogic.domain.v2.Domain;
 import oracle.kubernetes.weblogic.domain.v2.DomainSpec;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TestWatcher;
+import org.junit.runner.Description;
 
 public class ServerKubernetesObjectsLookupTest {
 
   private List<Memento> mementos = new ArrayList<>();
 
+  @Rule
+  public TestWatcher watcher =
+      new TestWatcher() {
+        @Override
+        protected void failed(Throwable e, Description description) {
+          super.failed(e, description);
+          System.out.println("Tell Russell\n" + DomainPresenceMonitor.getExplanation());
+          try {
+            Memento serverMap =
+                StaticStubSupport.preserve(ServerKubernetesObjectsManager.class, "serverMap");
+            Map<String, ServerKubernetesObjects> map = serverMap.getOriginalValue();
+            System.out.println("   internal: " + map);
+            System.out.println(
+                "   returned: " + ServerKubernetesObjectsManager.getServerKubernetesObjects());
+          } catch (NoSuchFieldException ignored) {
+          }
+        }
+      };
+
   @Before
   public void setUp() throws Exception {
     mementos.add(TestUtils.silenceOperatorLogger());
@@ -37,10 +60,12 @@ public void setUp() throws Exception {
     mementos.add(
         StaticStubSupport.install(
             ServerKubernetesObjectsManager.class, "serverMap", new ConcurrentHashMap<>()));
+    ServerKubernetesObjectsManager.clear();
+    DomainPresenceMonitor.clear();
   }
 
   @After
-  public void tearDown() throws Exception {
+  public void tearDown() {
     for (Memento memento : mementos) memento.revert();
   }