Skip to content

OWLS-86552 - Multiple pod restarts during rolling update fix. #2109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 17, 2020
Merged

OWLS-86552 - Multiple pod restarts during rolling update fix. #2109

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions operator/src/main/java/oracle/kubernetes/operator/steps/ManagedServerUpIteratorStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}


Expand Down Expand Up @@ -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()));
Expand Down