Skip to content

Commit 4fdc052

Browse files
committed
OWLS-81419
1 parent 9648538 commit 4fdc052

File tree

1 file changed

+22
-1
lines changed
  • operator/src/main/java/oracle/kubernetes/operator/helpers

1 file changed

+22
-1
lines changed

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@
99
import io.kubernetes.client.openapi.models.V1DeleteOptions;
1010
import io.kubernetes.client.openapi.models.V1EnvVar;
1111
import io.kubernetes.client.openapi.models.V1Job;
12+
import io.kubernetes.client.openapi.models.V1JobCondition;
13+
import io.kubernetes.client.openapi.models.V1JobStatus;
1214
import io.kubernetes.client.openapi.models.V1Pod;
1315
import io.kubernetes.client.openapi.models.V1PodList;
1416
import io.kubernetes.client.openapi.models.V1Volume;
1517
import io.kubernetes.client.openapi.models.V1VolumeMount;
18+
import oracle.kubernetes.operator.DomainStatusUpdater;
1619
import oracle.kubernetes.operator.JobWatcher;
1720
import oracle.kubernetes.operator.LabelConstants;
1821
import oracle.kubernetes.operator.ProcessingConstants;
@@ -383,7 +386,25 @@ public NextAction onSuccess(Packet packet, CallResponse<String> callResponse) {
383386
V1Job domainIntrospectorJob =
384387
(V1Job) packet.remove(ProcessingConstants.DOMAIN_INTROSPECTOR_JOB);
385388
if (isNotComplete(domainIntrospectorJob)) {
386-
return onFailure(packet, callResponse);
389+
List<String> jobConditionsReason = new ArrayList<>();
390+
if (domainIntrospectorJob != null) {
391+
V1JobStatus status = domainIntrospectorJob.getStatus();
392+
if (status != null && status.getConditions() != null) {
393+
for (V1JobCondition cond : status.getConditions()) {
394+
jobConditionsReason.add(cond.getReason());
395+
}
396+
}
397+
}
398+
if (jobConditionsReason.size() == 0) {
399+
jobConditionsReason.add(DomainStatusPatch.ERR_INTROSPECTOR);
400+
}
401+
//Introspector job is incomplete, update domain status and terminate processing
402+
return doNext(
403+
DomainStatusUpdater.createFailedStep(
404+
onSeparateLines(jobConditionsReason),
405+
onSeparateLines(severeStatuses),
406+
null),
407+
packet);
387408
}
388409

389410
return doNext(packet);

0 commit comments

Comments
 (0)