ignore delete domain watches with old creationTimestamp

Author: alai8

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

@@ -79,6 +79,7 @@
 import oracle.kubernetes.weblogic.domain.v1.Domain;
 import oracle.kubernetes.weblogic.domain.v1.DomainList;
 import oracle.kubernetes.weblogic.domain.v1.DomainSpec;
+import org.joda.time.DateTime;
 
 /** A Kubernetes Operator for WebLogic. */
 public class Main {
@@ -307,7 +308,7 @@ static void deleteStrandedResources() {
       String domainUID = entry.getKey();
       DomainPresenceInfo info = entry.getValue();
       if (info != null && info.getDomain() == null) {
-        deleteDomainPresence(info.getNamespace(), domainUID);
+        deleteDomainPresence(info.getNamespace(), domainUID, null);
       }
     }
   }
@@ -699,14 +700,36 @@ private static void deleteDomainPresence(Domain dom) {
 
     String domainUID = spec.getDomainUID();
 
-    deleteDomainPresence(namespace, domainUID);
+    deleteDomainPresence(namespace, domainUID, meta.getCreationTimestamp());
   }
 
-  private static void deleteDomainPresence(String namespace, String domainUID) {
+  private static DateTime getDomainCreationTimeStamp(DomainPresenceInfo domainPresenceInfo) {
+    if (domainPresenceInfo != null
+        && domainPresenceInfo.getDomain() != null
+        && domainPresenceInfo.getDomain().getMetadata() != null) {
+      return domainPresenceInfo.getDomain().getMetadata().getCreationTimestamp();
+    }
+    return null;
+  }
+
+  private static void deleteDomainPresence(
+      String namespace, String domainUID, DateTime deleteDomainDateTime) {
     LOGGER.entering();
 
-    DomainPresenceInfo info = DomainPresenceInfoManager.remove(domainUID);
+    DomainPresenceInfo info = DomainPresenceInfoManager.lookup(domainUID);
     if (info != null) {
+      DateTime infoDateTime = getDomainCreationTimeStamp(info);
+      if (infoDateTime != null
+          && deleteDomainDateTime != null
+          && deleteDomainDateTime.isBefore(infoDateTime)) {
+        LOGGER.exiting("Domain to be deleted is too old");
+        return;
+      }
+      info = DomainPresenceInfoManager.remove(domainUID);
+      if (info == null) {
+        LOGGER.exiting("Domain already deleted by another Fiber");
+        return;
+      }
       DomainPresenceControl.cancelDomainStatusUpdating(info);
     }
     FIBER_GATE.startFiber(

operator/src/test/java/oracle/kubernetes/operator/wlsconfig/WlsRetrieverTest.java

@@ -12,19 +12,26 @@
 
 import com.meterware.simplestub.Memento;
 import com.meterware.simplestub.Stub;
+import io.kubernetes.client.models.V1ObjectMeta;
 import io.kubernetes.client.models.V1Service;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import oracle.kubernetes.TestUtils;
 import oracle.kubernetes.operator.ProcessingConstants;
+import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
+import oracle.kubernetes.operator.helpers.DomainPresenceInfoManager;
+import oracle.kubernetes.operator.helpers.ServerKubernetesObjectsManager;
 import oracle.kubernetes.operator.http.HttpClient;
 import oracle.kubernetes.operator.wlsconfig.WlsRetriever.RequestType;
 import oracle.kubernetes.operator.wlsconfig.WlsRetriever.WithHttpClientStep;
+import oracle.kubernetes.operator.work.Component;
 import oracle.kubernetes.operator.work.NextAction;
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.Step;
+import oracle.kubernetes.weblogic.domain.v1.Domain;
+import oracle.kubernetes.weblogic.domain.v1.DomainSpec;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -105,6 +112,34 @@ public void withHttpClientStep_Health_nologIfFailedOnRetry() {
     assert (logRecords.isEmpty());
   }
 
+  @Test(expected = IllegalArgumentException.class)
+  public void WithHttpClientStep_const_throws_with_null_service() {
+    Step next = new MockStep(null);
+    new WithHttpClientStep(RequestType.HEALTH, null, next);
+  }
+
+  // @Test (expected =IllegalArgumentException.class)
+  public void ReadStep_apply_throws_with_null_service() {
+    final String SERVER_NAME = "managed-server1";
+    final String DOMAIN_UID = "testDomain";
+    Step next = new MockStep(null);
+    DomainSpec domainSpec = new DomainSpec();
+    domainSpec.setDomainUID(DOMAIN_UID);
+    Domain domain =
+        new Domain()
+            .withSpec(domainSpec)
+            .withMetadata(new V1ObjectMeta().namespace("testnamespace"));
+    DomainPresenceInfo domainPresenceInfo = DomainPresenceInfoManager.getOrCreate(domain);
+    ServerKubernetesObjectsManager.getOrCreate(domainPresenceInfo, DOMAIN_UID, SERVER_NAME);
+    Packet packet =
+        Stub.createStub(PacketStub.class)
+            .addSpi(DomainPresenceInfo.class, domainPresenceInfo)
+            .withServerName(SERVER_NAME);
+
+    Step readStep = WlsRetriever.readHealthStep(next);
+    readStep.apply(packet);
+  }
+
   abstract static class PacketStub extends Packet {
 
     Integer retryCount;
@@ -120,6 +155,12 @@ PacketStub withServerName(String serverName) {
       return this;
     }
 
+    PacketStub addSpi(Class clazz, Object spiObject) {
+      Component component = Component.createFor(spiObject);
+      this.getComponents().put(clazz.getName(), component);
+      return this;
+    }
+
     @Override
     public Object get(Object key) {
       if (HttpClient.KEY.equals(key)) {