Skip to content

Commit 18219c1

Browse files
authored
OWLS-87175 - Allow make right flow to continue when live data from the list older than cached data (#2196)
* Fix for OWLS-87175 for etcd restore use-case to allow the make-right flow when cached info is newer than the live info. * Allow the make right domain presence to continue when live data from the list is older than the cached data. * Minor debug message change.
1 parent 1366b56 commit 18219c1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,8 @@ private boolean isShouldContinue() {
662662
LOGGER.fine("Stop introspection retry - MII Fatal Error: "
663663
+ existingError);
664664
return false;
665-
} else if (isCachedInfoNewer(liveInfo, cachedInfo)) {
665+
} else if (!liveInfo.isPopulated() && isCachedInfoNewer(liveInfo, cachedInfo)) {
666+
LOGGER.fine("Cached domain info is newer than the live info from the watch event .");
666667
return false; // we have already cached this
667668
} else if (explicitRecheck || isSpecChanged(liveInfo, cachedInfo)) {
668669
if (exceededFailureRetryCount) {
@@ -677,7 +678,7 @@ private boolean isShouldContinue() {
677678
currentIntrospectFailureRetryCount,
678679
DomainPresence.getDomainPresenceFailureRetryMaxCount());
679680
}
680-
681+
LOGGER.fine("Continue the make-right domain presence, explicitRecheck -> " + explicitRecheck);
681682
return true;
682683
}
683684
cachedInfo.setDomain(getDomain());

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ public NextAction apply(Packet packet) {
134134
}
135135

136136
if (!clusteredRestarts.isEmpty()) {
137+
LOGGER.fine("Restarting server " + packet.get(ProcessingConstants.SERVER_NAME));
137138
for (Map.Entry<String, Queue<StepAndPacket>> entry : clusteredRestarts.entrySet()) {
138139
work.add(
139140
new StepAndPacket(

0 commit comments

Comments
 (0)