Skip to content

OWLS-87175 - Allow make right flow to continue when live data from the list older than cached data #2196

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 3 commits into from
Feb 17, 2021
Merged

OWLS-87175 - Allow make right flow to continue when live data from the list older than cached data #2196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
092884e
Fix for OWLS-87175 for etcd restore use-case to allow the make-right …
ankedia Feb 16, 2021
e4eb7a0
Allow the make right domain presence to continue when live data from …
ankedia Feb 17, 2021
fbe3971
Minor debug message change.
ankedia Feb 17, 2021
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
5 changes: 3 additions & 2 deletions operator/src/main/java/oracle/kubernetes/operator/DomainProcessorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,8 @@ private boolean isShouldContinue() {
LOGGER.fine("Stop introspection retry - MII Fatal Error: "
+ existingError);
return false;
} else if (isCachedInfoNewer(liveInfo, cachedInfo)) {
} else if (!liveInfo.isPopulated() && isCachedInfoNewer(liveInfo, cachedInfo)) {
LOGGER.fine("Cached domain info is newer than the live info from the watch event .");
return false; // we have already cached this
} else if (explicitRecheck || isSpecChanged(liveInfo, cachedInfo)) {
if (exceededFailureRetryCount) {
Expand All @@ -677,7 +678,7 @@ private boolean isShouldContinue() {
currentIntrospectFailureRetryCount,
DomainPresence.getDomainPresenceFailureRetryMaxCount());
}

LOGGER.fine("Continue the make-right domain presence, explicitRecheck -> " + explicitRecheck);
return true;
}
cachedInfo.setDomain(getDomain());
Expand Down
1 change: 1 addition & 0 deletions operator/src/main/java/oracle/kubernetes/operator/helpers/RollingHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ public NextAction apply(Packet packet) {
}

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