Review comments and minor cleanup.

Author: ankedia

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

@@ -27,7 +27,6 @@ public interface ProcessingConstants {
 
   String DOMAIN_TOPOLOGY = "domainTopology";
   String JOB_POD_NAME = "jobPodName";
-  String JOB_IMAGE_NAME = "jobImageName";
   String DOMAIN_INTROSPECTOR_JOB = "domainIntrospectorJob";
   String DOMAIN_INTROSPECTOR_LOG_RESULT = "domainIntrospectorLogResult";
   String DOMAIN_INTROSPECT_REQUESTED = "domainIntrospectRequested";

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

@@ -6,6 +6,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -49,6 +50,7 @@
 import org.yaml.snakeyaml.Yaml;
 
 import static java.lang.System.lineSeparator;
+import static java.time.temporal.ChronoUnit.MILLIS;
 import static oracle.kubernetes.operator.DomainStatusUpdater.BAD_TOPOLOGY;
 import static oracle.kubernetes.operator.IntrospectorConfigMapConstants.DOMAINZIP_HASH;
 import static oracle.kubernetes.operator.IntrospectorConfigMapConstants.DOMAIN_INPUTS_HASH;
@@ -508,7 +510,7 @@ public NextAction apply(Packet packet) {
     }
 
     private long timeSinceJobStart(Packet packet) {
-      return System.currentTimeMillis() - ((Long) packet.get(JobHelper.START_TIME));
+      return ((OffsetDateTime)packet.get(JobHelper.START_TIME)).until(OffsetDateTime.now(), MILLIS);
     }
   }
 

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

@@ -3,6 +3,7 @@
 
 package oracle.kubernetes.operator.helpers;
 
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -50,6 +51,7 @@
 import oracle.kubernetes.weblogic.domain.model.ManagedServer;
 import oracle.kubernetes.weblogic.domain.model.ServerEnvVars;
 
+import static java.time.temporal.ChronoUnit.SECONDS;
 import static oracle.kubernetes.operator.DomainSourceType.FromModel;
 import static oracle.kubernetes.operator.DomainStatusUpdater.INSPECTING_DOMAIN_PROGRESS_REASON;
 import static oracle.kubernetes.operator.DomainStatusUpdater.createProgressingStartedEventStep;
@@ -96,7 +98,7 @@ private static boolean runIntrospector(Packet packet, DomainPresenceInfo info) {
     LOGGER.fine("isModelInImageUpdate: " + isModelInImageUpdate(packet, info));
     return topology == null
           || isBringingUpNewDomain(packet, info)
-          || introspectionRequested(packet)
+          || isIntrospectionRequestedAndRemove(packet)
           || isModelInImageUpdate(packet, info)
           || isIntrospectVersionChanged(packet, info);
   }
@@ -105,7 +107,7 @@ private static boolean isBringingUpNewDomain(Packet packet, DomainPresenceInfo i
     return runningServersCount(info) == 0 && creatingServers(info) && isGenerationChanged(packet, info);
   }
 
-  private static boolean introspectionRequested(Packet packet) {
+  private static boolean isIntrospectionRequestedAndRemove(Packet packet) {
     return packet.remove(ProcessingConstants.DOMAIN_INTROSPECT_REQUESTED) != null;
   }
 
@@ -399,7 +401,7 @@ public NextAction apply(Packet packet) {
       if (runIntrospector(packet, info)) {
         JobStepContext context = new DomainIntrospectorJobStepContext(packet);
 
-        packet.putIfAbsent(START_TIME, System.currentTimeMillis());
+        packet.putIfAbsent(START_TIME, OffsetDateTime.now());
 
         return doNext(
             Step.chain(
@@ -455,7 +457,7 @@ public NextAction onSuccess(Packet packet, CallResponse callResponse) {
 
         if (job != null) {
           packet.putIfAbsent(START_TIME, Optional.ofNullable(job.getMetadata())
-                  .map(m -> m.getCreationTimestamp()).map(t -> t.toInstant().toEpochMilli()).orElse(0L));
+                  .map(m -> m.getCreationTimestamp()).orElse(OffsetDateTime.now()));
           return doNext(Step.chain(
                   createProgressingStartedEventStep(info, INSPECTING_DOMAIN_PROGRESS_REASON, true, null),
                   readDomainIntrospectorPodLogStep(null),
@@ -465,7 +467,7 @@ public NextAction onSuccess(Packet packet, CallResponse callResponse) {
                   new DomainProcessorImpl.IntrospectionRequestStep(info),
                   createDomainIntrospectorJobStep(getNext())), packet);
         } else {
-          packet.putIfAbsent(START_TIME, System.currentTimeMillis());
+          packet.putIfAbsent(START_TIME, OffsetDateTime.now());
           return doNext(Step.chain(
                   ConfigMapHelper.readExistingIntrospectorConfigMap(namespace, info.getDomainUid()),
                   createDomainIntrospectorJobStep(getNext())), packet);
@@ -543,7 +545,10 @@ public NextAction onSuccess(Packet packet, CallResponse<String> callResponse) {
         }
         //Introspector job is incomplete, update domain status and terminate processing
         Step nextStep = null;
-        if (System.currentTimeMillis() > getJobLazyDeletionTime(domainIntrospectorJob)) {
+        int retryIntervalSeconds = TuningParameters.getInstance().getMainTuning().domainPresenceRecheckIntervalSeconds;
+
+        if (OffsetDateTime.now().isAfter(
+                getJobCreationTime(domainIntrospectorJob).plus(retryIntervalSeconds, SECONDS))) {
           //Introspector job is incomplete and current time is greater than the lazy deletion time for the job,
           //update the domain status and execute the next step
           nextStep = getNext();
@@ -560,11 +565,9 @@ public NextAction onSuccess(Packet packet, CallResponse<String> callResponse) {
       return doNext(packet);
     }
 
-    private Long getJobLazyDeletionTime(V1Job domainIntrospectorJob) {
-      int retryIntervalSeconds = TuningParameters.getInstance().getMainTuning().domainPresenceRecheckIntervalSeconds;
+    private OffsetDateTime getJobCreationTime(V1Job domainIntrospectorJob) {
       return Optional.ofNullable(domainIntrospectorJob.getMetadata())
-              .map(m -> m.getCreationTimestamp()).map(t -> t.toInstant().toEpochMilli()).orElse(0L)
-              + (retryIntervalSeconds * 1000L);
+              .map(m -> m.getCreationTimestamp()).orElse(OffsetDateTime.now());
     }
 
     private boolean isNotComplete(V1Job domainIntrospectorJob) {

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

@@ -3,6 +3,9 @@
 
 package oracle.kubernetes.operator.helpers;
 
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -91,7 +94,8 @@ public void setUp() throws Exception {
 
     testSupport.defineResources(domain);
     testSupport.addDomainPresenceInfo(info);
-    testSupport.addToPacket(JobHelper.START_TIME, System.currentTimeMillis() - 10);
+    testSupport.addToPacket(JobHelper.START_TIME,
+            OffsetDateTime.ofInstant(Instant.now().minusMillis(10L), ZoneId.systemDefault()));
   }
 
   @AfterEach