Skip to content

Commit c88eb7b

Browse files
committed
Review comments missed before
1 parent e575e4e commit c88eb7b

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -856,8 +856,10 @@ public void onThrowable(Packet packet, Throwable throwable) {
856856
gate.getExecutor()
857857
.schedule(
858858
() -> {
859-
existing.setPopulated(false);
860-
makeRightDomainPresence(existing, true, isDeleting, false);
859+
DomainPresenceInfo existing2 =
860+
getExistingDomainPresenceInfo(ns, domainUID);
861+
existing2.setPopulated(false);
862+
makeRightDomainPresence(existing2, true, isDeleting, false);
861863
},
862864
DomainPresence.getDomainPresenceFailureRetrySeconds(),
863865
TimeUnit.SECONDS);

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,15 @@ public NextAction apply(Packet packet) {
171171
(fiber) -> {
172172
Complete complete =
173173
(V1Job job) -> {
174-
if (!shouldProcessJob(job)) {
175-
return;
176-
}
177174
completeCallbackRegistrations.remove(job.getMetadata().getName());
178175
if (didResume.compareAndSet(false, true)) {
179-
LOGGER.fine("Job status: " + job.getStatus());
180-
packet.put(ProcessingConstants.DOMAIN_INTROSPECTOR_JOB, job);
181-
fiber.resume(packet);
176+
if (!shouldProcessJob(job)) {
177+
fiber.cancel(false);
178+
} else {
179+
LOGGER.fine("Job status: " + job.getStatus());
180+
packet.put(ProcessingConstants.DOMAIN_INTROSPECTOR_JOB, job);
181+
fiber.resume(packet);
182+
}
182183
}
183184
};
184185
completeCallbackRegistrations.put(metadata.getName(), complete);

0 commit comments

Comments
 (0)