|
85 | 85 | import static oracle.kubernetes.operator.ProcessingConstants.DOMAIN_TOPOLOGY;
|
86 | 86 | import static oracle.kubernetes.operator.ProcessingConstants.MII_DYNAMIC_UPDATE;
|
87 | 87 | import static oracle.kubernetes.operator.ProcessingConstants.MII_DYNAMIC_UPDATE_RESTART_REQUIRED;
|
| 88 | +import static oracle.kubernetes.operator.ProcessingConstants.MII_DYNAMIC_UPDATE_SUCCESS; |
88 | 89 | import static oracle.kubernetes.operator.ProcessingConstants.SERVER_HEALTH_MAP;
|
89 | 90 | import static oracle.kubernetes.operator.ProcessingConstants.SERVER_STATE_MAP;
|
90 | 91 | import static oracle.kubernetes.operator.WebLogicConstants.RUNNING_STATE;
|
@@ -424,10 +425,12 @@ static class DomainStatusUpdaterContext {
|
424 | 425 | private DomainStatus newStatus;
|
425 | 426 | private final List<EventData> newEvents = new ArrayList<>();
|
426 | 427 | final boolean endOfProcessing;
|
| 428 | + private Packet packet; |
427 | 429 |
|
428 | 430 | DomainStatusUpdaterContext(Packet packet, DomainStatusUpdaterStep domainStatusUpdaterStep) {
|
429 | 431 | info = DomainPresenceInfo.fromPacket(packet).orElseThrow();
|
430 | 432 | isMakeRight = MakeRightDomainOperation.isMakeRight(packet);
|
| 433 | + this.packet = packet; |
431 | 434 | this.domainStatusUpdaterStep = domainStatusUpdaterStep;
|
432 | 435 | endOfProcessing = (Boolean) packet.getOrDefault(ProcessingConstants.END_OF_PROCESSING, Boolean.FALSE);
|
433 | 436 | }
|
@@ -538,7 +541,10 @@ Step createUpdateSteps(Step next) {
|
538 | 541 | if (!isStatusUnchanged()) {
|
539 | 542 | result.add(createDomainStatusReplaceStep());
|
540 | 543 | } else {
|
541 |
| - if (endOfProcessing && isMakeRight) { |
| 544 | + boolean successFullDynamicUpdate = MII_DYNAMIC_UPDATE_SUCCESS.equals(packet.get(MII_DYNAMIC_UPDATE)) |
| 545 | + || MII_DYNAMIC_UPDATE_RESTART_REQUIRED.equals(packet.get(MII_DYNAMIC_UPDATE)); |
| 546 | + |
| 547 | + if ((endOfProcessing && isMakeRight) || successFullDynamicUpdate) { |
542 | 548 | Optional.ofNullable(createDomainStatusObservedGenerationReplaceStep()).ifPresent(result::add);
|
543 | 549 | }
|
544 | 550 | }
|
|
0 commit comments