OWLS-86552 - Fix for multiple pod restarts during rolling update. ManagedServerUpAfterStep is executed after servers in all clusters started. (#2109)

ankedia · web-flow · commit 46a67d7f5504 · 2020-12-17T13:52:03.000-05:00
diff --git a/operator/src/main/java/oracle/kubernetes/operator/steps/ManagedServerUpIteratorStep.java b/operator/src/main/java/oracle/kubernetes/operator/steps/ManagedServerUpIteratorStep.java
@@ -94,10 +94,11 @@ public NextAction apply(Packet packet) {
     }
 
     if (!work.isEmpty()) {
-      return doForkJoin(DomainStatusUpdater.createStatusUpdateStep(getNext()), packet, work);
+      return doForkJoin(DomainStatusUpdater.createStatusUpdateStep(
+              new ManagedServerUpAfterStep(getNext())), packet, work);
     }
 
-    return doNext(DomainStatusUpdater.createStatusUpdateStep(getNext()), packet);
+    return doNext(DomainStatusUpdater.createStatusUpdateStep(new ManagedServerUpAfterStep(getNext())), packet);
   }
 
 
@@ -167,7 +168,7 @@ void add(StepAndPacket serverToStart) {
     public NextAction apply(Packet packet) {
 
       if (startDetailsQueue.isEmpty()) {
-        return doNext(new ManagedServerUpAfterStep(getNext()), packet);
+        return doNext(getNext(), packet);
       } else if (hasServerAvailableToStart(packet.getSpi(DomainPresenceInfo.class))) {
         numStarted.getAndIncrement();
         return doForkJoin(this, packet, Collections.singletonList(startDetailsQueue.poll()));

Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,11 @@ public NextAction apply(Packet packet) {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`if (!work.isEmpty()) {`
`97`		`- return doForkJoin(DomainStatusUpdater.createStatusUpdateStep(getNext()), packet, work);`
	`97`	`+ return doForkJoin(DomainStatusUpdater.createStatusUpdateStep(`
	`98`	`+ new ManagedServerUpAfterStep(getNext())), packet, work);`
`98`	`99`	`}`
`99`	`100`
`100`		`- return doNext(DomainStatusUpdater.createStatusUpdateStep(getNext()), packet);`
	`101`	`+ return doNext(DomainStatusUpdater.createStatusUpdateStep(new ManagedServerUpAfterStep(getNext())), packet);`
`101`	`102`	`}`
`102`	`103`
`103`	`104`
`@@ -167,7 +168,7 @@ void add(StepAndPacket serverToStart) {`
`167`	`168`	`public NextAction apply(Packet packet) {`
`168`	`169`
`169`	`170`	`if (startDetailsQueue.isEmpty()) {`
`170`		`- return doNext(new ManagedServerUpAfterStep(getNext()), packet);`
	`171`	`+ return doNext(getNext(), packet);`
`171`	`172`	`} else if (hasServerAvailableToStart(packet.getSpi(DomainPresenceInfo.class))) {`
`172`	`173`	`numStarted.getAndIncrement();`
`173`	`174`	`return doForkJoin(this, packet, Collections.singletonList(startDetailsQueue.poll()));`