3.3 branch - OWLS-97340 - HTTP warnings logged continuously after changing serverStartPolicy to NEVER (#2856)

* use up-to-date DomainPresenceInfo for creating StatusReaderStep if available

* backport fix for OWLS-96905 to 3.3 branch

Author: alai8

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

@@ -103,8 +103,13 @@ public NextAction apply(Packet packet) {
       AtomicInteger remainingServerHealthToRead = new AtomicInteger();
       packet.put(ProcessingConstants.REMAINING_SERVERS_HEALTH_TO_READ, remainingServerHealthToRead);
 
+      DomainPresenceInfo currentInfo =
+          Optional.ofNullable(
+              DomainProcessorImpl.getExistingDomainPresenceInfo(info.getNamespace(), info.getDomainUid()))
+              .orElse(info);
+
       Collection<StepAndPacket> startDetails =
-          info.getServerPods()
+          currentInfo.getServerPods()
               .map(pod -> createStatusReaderStep(packet, pod))
               .collect(Collectors.toList());
 

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

@@ -71,7 +71,9 @@ private static Step scaleDownIfNecessary(
 
     if (info.getDomain().isShuttingDown()) {
       insert(steps, createAvailableHookStep());
-      factory.shutdownInfos.add(new ServerShutdownInfo(domainTopology.getAdminServerName(), null));
+      Optional.ofNullable(domainTopology).ifPresent(
+          wlsDomainConfig ->
+              factory.shutdownInfos.add(new ServerShutdownInfo(wlsDomainConfig.getAdminServerName(), null)));
     }
 
     List<ServerShutdownInfo> serversToStop = getServersToStop(info, factory.shutdownInfos);

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+// Copyright (c) 2019, 2022, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator;
@@ -57,8 +57,9 @@ class ServerStatusReaderTest extends HttpUserAgentTest {
   private final FiberTestSupport testSupport = new FiberTestSupport();
   private final List<Memento> mementos = new ArrayList<>();
   private final Domain domain =
-      new Domain().withMetadata(new V1ObjectMeta().namespace(NS)).withSpec(new DomainSpec());
+      new Domain().withMetadata(new V1ObjectMeta().namespace(NS)).withSpec(new DomainSpec().withDomainUid(UID));
   private final DomainPresenceInfo info = new DomainPresenceInfo(domain);
+  private final Map<String, Map<String, DomainPresenceInfo>> presenceInfoMap = new HashMap<>();
 
   @BeforeEach
   public void setUp() throws NoSuchFieldException {
@@ -69,6 +70,7 @@ public void setUp() throws NoSuchFieldException {
     mementos.add(ClientFactoryStub.install());
 
     testSupport.addDomainPresenceInfo(info);
+    mementos.add(StaticStubSupport.install(DomainProcessorImpl.class, "DOMAINS", presenceInfoMap));
   }
 
   private V1Pod createPod(String serverName) {
@@ -134,6 +136,23 @@ void createDomainStatusReaderStep_initializesRemainingServersHealthRead_withNumS
         is(2));
   }
 
+  @Test
+  void createDomainStatusReaderStep_usesInfoFromDomainProcessorIfAvailable() {
+    info.setServerPod("server1", createPod("server1"));
+
+    DomainPresenceInfo latestInfo = new DomainPresenceInfo(domain);
+    latestInfo.setServerPod("server1", createPod("server1"));
+    latestInfo.setServerPod("server2", createPod("server2"));
+    presenceInfoMap.put(NS, Map.of(UID, latestInfo));
+
+    Packet packet =
+        testSupport.runSteps(ServerStatusReader.createDomainStatusReaderStep(info, 0, endStep));
+
+    assertThat(
+        ((AtomicInteger) packet.get(ProcessingConstants.REMAINING_SERVERS_HEALTH_TO_READ)).get(),
+        is(2));
+  }
+
   @SuppressWarnings("unchecked")
   private Map<String, String> getServerStates(Packet packet) {
     return (Map<String, String>) packet.get(SERVER_STATE_MAP);

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2018, 2021, Oracle and/or its affiliates.
+// Copyright (c) 2018, 2022, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator.steps;
@@ -531,6 +531,13 @@ void whenShuttingDown_allowAdminServerNameInListOfServers() {
         "server3", ADMIN);
   }
 
+  @Test
+  void whenShuttingDown_withNullWlsDomainConfig_ensureNoException() {
+    configurator.setShuttingDown(true);
+
+    createNextStepWithNullWlsDomainConfig();
+  }
+
   @Test
   void whenClusterStartupDefinedWithPreCreateServerService_addAllToServers() {
     configureCluster("cluster1").withPrecreateServerService(true);
@@ -787,6 +794,14 @@ private Step createNextStep(List<String> servers) {
     return factory.createServerStep(domainPresenceInfo, config, serversUpStepFactory, nextStep);
   }
 
+  private Step createNextStepWithNullWlsDomainConfig() {
+    configSupport.setAdminServerName(ADMIN);
+    ManagedServersUpStep.NextStepFactory factory = factoryMemento.getOriginalValue();
+    ServersUpStepFactory serversUpStepFactory = new ServersUpStepFactory(null, domain, domainPresenceInfo, false);
+    List<DomainPresenceInfo.ServerShutdownInfo> ssi = new ArrayList<>();
+    return factory.createServerStep(domainPresenceInfo, null, serversUpStepFactory, nextStep);
+  }
+
   private void addShutdownServerInfo(String serverName, List<String> servers,
                                      List<DomainPresenceInfo.ServerShutdownInfo> ssi) {
     if (!serverName.equals(configSupport.createDomainConfig().getAdminServerName()) && !servers.contains(serverName)) {