Revert "Fix domain delayed response"

This reverts commit 5e9d74a.

Author: rjeberhard

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

@@ -601,20 +601,14 @@ private void processServerPodWatch(V1Pod pod, String watchType) {
         // fall through
       case MODIFIED:
         boolean podPreviouslyEvicted = info.setServerPodFromEvent(serverName, pod, PodHelper::isEvicted);
-        boolean isEvicted = PodHelper.isEvicted(pod);
-        if (isEvicted && !podPreviouslyEvicted) {
+        if (PodHelper.isEvicted(pod) && !podPreviouslyEvicted) {
           if (PodHelper.shouldRestartEvictedPod(pod)) {
             LOGGER.info(MessageKeys.POD_EVICTED, getPodName(pod), getPodStatusMessage(pod));
             createMakeRightOperation(info).interrupt().withExplicitRecheck().execute();
           } else {
             LOGGER.info(MessageKeys.POD_EVICTED_NO_RESTART, getPodName(pod), getPodStatusMessage(pod));
           }
         }
-        boolean isReady = PodHelper.isReady(pod);
-        boolean isLabeledForShutdown = PodHelper.isPodAlreadyAnnotatedForShutdown(pod);
-        if ((isEvicted || isReady != isLabeledForShutdown || PodHelper.isFailed(pod)) && !PodHelper.isDeleting(pod)) {
-          createMakeRightOperation(info).interrupt().withExplicitRecheck().execute();
-        }
         boolean isUnschedulable = PodHelper.hasUnSchedulableCondition(pod);
         if (isUnschedulable) {
           LOGGER.info(POD_UNSCHEDULABLE,  getPodName(pod), getUnSchedulableConditionMessage(pod));

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

@@ -25,7 +25,6 @@ public interface LabelConstants {
   String MII_UPDATED_RESTART_REQUIRED_LABEL = "weblogic.configChangesPendingRestart";
   String INTROSPECTION_DOMAIN_SPEC_GENERATION = "weblogic.domainSpecGeneration";
   String TO_BE_ROLLED_LABEL = "weblogic.awaitingPodRoll";
-  String TO_BE_SHUTDOWN_LABEL = "weblogic.awaitingShutdown";
   String DOMAIN_OBSERVED_GENERATION_LABEL = "weblogic.domainObservedGeneration";
   String CLUSTER_OBSERVED_GENERATION_LABEL = "weblogic.clusterObservedGeneration";
   String SERVICE_TYPE_LABEL = "serviceType";

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

@@ -7,7 +7,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -49,7 +48,6 @@
 import oracle.kubernetes.weblogic.domain.model.ServerStatus;
 import oracle.kubernetes.weblogic.domain.model.Shutdown;
 
-import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
 import static oracle.kubernetes.operator.KubernetesConstants.EVICTED_REASON;
 import static oracle.kubernetes.operator.KubernetesConstants.POD_SCHEDULED;
 import static oracle.kubernetes.operator.KubernetesConstants.UNSCHEDULABLE_REASON;
@@ -58,7 +56,6 @@
 import static oracle.kubernetes.operator.ProcessingConstants.SERVERS_TO_ROLL;
 import static oracle.kubernetes.operator.WebLogicConstants.SHUTDOWN_STATE;
 import static oracle.kubernetes.operator.WebLogicConstants.UNKNOWN_STATE;
-import static oracle.kubernetes.operator.helpers.PodDisruptionBudgetHelper.getDomainUid;
 
 @SuppressWarnings("ConstantConditions")
 public class PodHelper {
@@ -131,7 +128,6 @@ public static boolean isWaitingToRoll(V1Pod pod) {
             .orElse(false);
   }
 
-
   static boolean hasReadyServer(V1Pod pod) {
     return Optional.ofNullable(pod).map(PodHelper::hasReadyStatus).orElse(false);
   }
@@ -397,89 +393,6 @@ public static String getPodLabel(V1Pod pod, String labelName) {
         .orElse(null);
   }
 
-
-  /**
-   * get pod's annotation value for a annotation name.
-   * @param pod pod
-   * @param annotationName annotation name
-   * @return annotation value
-   */
-  public static String getPodAnnotation(V1Pod pod, String annotationName) {
-    return Optional.ofNullable(pod)
-            .map(V1Pod::getMetadata)
-            .map(V1ObjectMeta::getAnnotations)
-            .map(m -> m.get(annotationName))
-            .orElse(null);
-  }
-
-  private static boolean hasAnnotation(V1Pod pod, String annotation) {
-    return Optional.ofNullable(pod).map(V1Pod::getMetadata).map(V1ObjectMeta::getAnnotations)
-            .map(l -> l.containsKey(annotation)).orElse(false);
-  }
-
-  private static Step patchPodAnnotation(V1Pod pod, String annotation, String value, Step next) {
-
-    if (!hasAnnotation(pod, annotation)) {
-      JsonPatchBuilder patchBuilder = Json.createPatchBuilder();
-      patchBuilder.add("/metadata/annotations/" + annotation, value);
-      new CallBuilder()
-              .patchPodAsync(pod.getMetadata().getName(), pod.getMetadata().getNamespace(),
-                      pod.getMetadata().getLabels().get(LabelConstants.DOMAINUID_LABEL),
-                      new V1Patch(patchBuilder.build().toString()),
-                      patchResponse(next));
-    }
-    return next;
-  }
-
-  private static ResponseStep<V1Pod> patchResponse(Step next) {
-    return new PatchPodResponseStep(next);
-  }
-
-  private static class PatchPodResponseStep extends ResponseStep<V1Pod> {
-    PatchPodResponseStep(Step next) {
-      super(next);
-    }
-
-    @Override
-    public NextAction onSuccess(Packet packet, CallResponse<V1Pod> callResponse) {
-      DomainPresenceInfo info =  packet.getSpi(DomainPresenceInfo.class);
-      V1Pod pod = callResponse.getResult();
-      info.setServerPod(getPodServerName(pod), pod);
-      return doNext(packet);
-    }
-
-    @Override
-    public NextAction onFailure(Packet packet, CallResponse<V1Pod> callResponse) {
-      if (callResponse.getStatusCode() == HTTP_NOT_FOUND) {
-        return doNext(packet);
-      }
-      return super.onFailure(packet, callResponse);
-    }
-  }
-
-  /**
-   * Annotate pod as needing to shut down.
-   * @param pod Pod
-   * @param next Next step
-   * @return Step that will check for existing annotation and add if it is missing
-   */
-  public static Step annotatePodAsNeedingToShutdown(V1Pod pod, String value, Step next) {
-    return patchPodAnnotation(pod, LabelConstants.TO_BE_SHUTDOWN_LABEL, value, next);
-  }
-
-  /**
-   * Check if the pod is already annotated for shut down.
-   * @param pod Pod
-   * @return true, if the pod is already annotated.
-   */
-  public static boolean isPodAlreadyAnnotatedForShutdown(V1Pod pod) {
-    return !Objects.isNull(getPodShutdownAnnotation(pod));
-  }
-
-  public static String getPodShutdownAnnotation(V1Pod pod) {
-    return getPodAnnotation(pod, LabelConstants.TO_BE_SHUTDOWN_LABEL);
-  }
-
   /**
    * Get the message from the pod's status.
    * @param pod pod

operator/src/main/java/oracle/kubernetes/operator/steps/ShutdownManagedServerStep.java

@@ -5,7 +5,6 @@
 
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.time.OffsetDateTime;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -67,9 +66,9 @@ private ShutdownManagedServerStep(Step next, String serverName, V1Pod pod) {
   /**
    * Creates asynchronous {@link Step}.
    *
-   * @param next       Next processing step
+   * @param next Next processing step
    * @param serverName name of server
-   * @param pod        server pod
+   * @param pod server pod
    * @return asynchronous step
    */
   static Step createShutdownManagedServerStep(Step next, String serverName, V1Pod pod) {
@@ -81,15 +80,15 @@ public NextAction apply(Packet packet) {
     LOGGER.fine(MessageKeys.BEGIN_SERVER_SHUTDOWN_REST, serverName);
     V1Service service = getDomainPresenceInfo(packet).getServerService(serverName);
 
-    String now = OffsetDateTime.now().toString();
-    if (service == null || !PodHelper.isReady(pod) || PodHelper.isFailed(pod) || PodHelper.isWaitingToRoll(pod)) {
-      return doNext(PodHelper.annotatePodAsNeedingToShutdown(pod, now, getNext()), packet);
-    }
-    return doNext(
+    if (service == null) {
+      return doNext(packet);
+    } else {
+      return doNext(
             Step.chain(
-                    SecretHelper.createAuthorizationSourceStep(),
-                    PodHelper.annotatePodAsNeedingToShutdown(pod, now,
-                            new ShutdownManagedServerWithHttpStep(service, pod, getNext()))),  packet);
+                SecretHelper.createAuthorizationSourceStep(),
+                new ShutdownManagedServerWithHttpStep(service, pod, getNext())),
+            packet);
+    }
   }
 
   static final class ShutdownManagedServerProcessing extends HttpRequestProcessing {

operator/src/test/java/oracle/kubernetes/operator/DomainProcessorTest.java

@@ -726,7 +726,6 @@ void afterMakeRightAndChangeServerToNever_serverPodsWaitForShutdownWithHttpToCom
     domainConfigurator.withDefaultServerStartPolicy(ServerStartPolicy.NEVER);
     DomainStatus status = newInfo.getDomain().getStatus();
     defineServerShutdownWithHttpOkResponse();
-    makePodsReady();
     setAdminServerStatus(status, SUSPENDING_STATE);
     setManagedServerState(status, SUSPENDING_STATE);
 

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

@@ -517,7 +517,23 @@ void onModifyEventWithEvictedServerPod_cycleServerPod() {
     assertThat(numPodsDeleted, is(1));
     assertThat(createdPodNames, hasItem(SERVER));
   }
-  
+
+  @Test
+  void onModifyEventWithEvictedServerPod_dontCycleAlreadyEvictedServerPod() {
+    V1Pod currentPod = withEvictedStatus(createServerPod());
+    V1Pod modifiedPod = withEvictedStatus(createServerPod());
+    List<String> createdPodNames = new ArrayList<>();
+    testSupport.doOnCreate(POD, p -> recordPodCreation((V1Pod) p, createdPodNames));
+
+    info.setServerPod(SERVER, currentPod);
+    Watch.Response<V1Pod> event = WatchEvent.createModifiedEvent(modifiedPod).toWatchResponse();
+
+    processor.dispatchPodWatch(event);
+
+    assertThat(numPodsDeleted, is(0));
+    assertThat(createdPodNames, not(hasItem(SERVER)));
+  }
+
   @Test
   void onModifyEventWithEvictedServerPod_notCycleServerPod_ifConfiguredNotTo() {
     TuningParametersStub.setParameter("restartEvictedPods", "false");

operator/src/test/java/oracle/kubernetes/operator/steps/ShutdownManagedServerStepTest.java

@@ -18,9 +18,7 @@
 import io.kubernetes.client.openapi.models.V1EnvVar;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.openapi.models.V1Pod;
-import io.kubernetes.client.openapi.models.V1PodCondition;
 import io.kubernetes.client.openapi.models.V1PodSpec;
-import io.kubernetes.client.openapi.models.V1PodStatus;
 import io.kubernetes.client.openapi.models.V1Service;
 import oracle.kubernetes.operator.DomainProcessorTestSetup;
 import oracle.kubernetes.operator.KubernetesConstants;
@@ -200,13 +198,7 @@ private V1Pod createPod(String serverName) {
     List<V1EnvVar> env = addShutdownEnvVars();
     List<V1Container> containers = addEnvToWLSContainer(env);
     V1PodSpec podSpec = new V1PodSpec().containers(containers);
-    return new V1Pod().metadata(createManagedPodMetadata(serverName)).spec(podSpec).status(createPodReadyStatus());
-  }
-
-  private V1PodStatus createPodReadyStatus() {
-    return new V1PodStatus()
-        .phase("Running")
-        .addConditionsItem(new V1PodCondition().status("True").type("Ready"));
+    return new V1Pod().metadata(createManagedPodMetadata(serverName)).spec(podSpec);
   }
 
   @Nonnull