Skip to content

Commit 7464a5e

Browse files
authored
OWLS-107980 - Fix for unexpected introspector failure message in the operator logs. (#4159)
* OWLS-107980 - Fix for unexpected introspector failure message in the operator logs.
1 parent f02eb30 commit 7464a5e

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,6 @@ private Step deleteIntrospectorJob() {
498498
}
499499

500500
class DeleteDomainIntrospectorJobStep extends Step {
501-
502501
@Override
503502
public NextAction apply(Packet packet) {
504503
logJobDeleted(getDomainUid(), getNamespace(), getJobName(), packet);
@@ -885,14 +884,18 @@ static void logJobDeleted(String domainUid, String namespace, String jobName, Pa
885884

886885
packet.remove(ProcessingConstants.INTROSPECTOR_JOB_FAILURE_LOGGED);
887886
if (domainIntrospectorJob != null
888-
&& !JobWatcher.isComplete(domainIntrospectorJob)) {
887+
&& hasStatusAndCondition(domainIntrospectorJob) && !JobWatcher.isComplete(domainIntrospectorJob)) {
889888
logIntrospectorFailure(packet, domainIntrospectorJob);
890889
}
891890
packet.remove(ProcessingConstants.JOB_POD_NAME);
892891

893892
LOGGER.fine(getJobDeletedMessageKey(), domainUid, namespace, jobName);
894893
}
895894

895+
private static boolean hasStatusAndCondition(V1Job job) {
896+
return job.getStatus() != null && job.getStatus().getConditions() != null;
897+
}
898+
896899
static String getJobDeletedMessageKey() {
897900
return MessageKeys.JOB_DELETED;
898901
}

operator/src/test/java/oracle/kubernetes/operator/helpers/DomainIntrospectorJobTest.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1317,13 +1317,25 @@ void whenIntrospectorJobNotNeeded_validateDomainAgainstPreviousTopology() throws
13171317
}
13181318

13191319
@Test
1320-
void whenJobLogContainsSevereError_logJobInfosOnDelete() {
1320+
void whenJobStatusContainsNoConditions_dontLogJobFailedAndInfosOnDelete() {
13211321
testSupport.defineResources(createIntrospectorJob());
13221322
IntrospectionTestUtils.defineIntrospectionPodLog(testSupport, SEVERE_MESSAGE);
13231323
testSupport.addToPacket(DOMAIN_INTROSPECTOR_JOB, testSupport.getResourceWithName(JOB, getJobName()));
13241324

13251325
testSupport.runSteps(JobHelper.deleteDomainIntrospectorJobStep(null));
13261326

1327+
assertThat(logRecords, not(containsInfo(getJobFailedMessageKey())));
1328+
assertThat(logRecords, not(containsFine(getJobFailedDetailMessageKey())));
1329+
assertThat(logRecords, containsFine(getJobDeletedMessageKey()));
1330+
}
1331+
1332+
@Test
1333+
void whenJobStatusHasFailedCondition_logJobInfosOnDelete() {
1334+
testSupport.defineResources(asFailedJob(createIntrospectorJob()));
1335+
testSupport.addToPacket(DOMAIN_INTROSPECTOR_JOB, testSupport.getResourceWithName(JOB, getJobName()));
1336+
1337+
testSupport.runSteps(JobHelper.deleteDomainIntrospectorJobStep(null));
1338+
13271339
assertThat(logRecords, containsInfo(getJobFailedMessageKey()));
13281340
assertThat(logRecords, containsFine(getJobFailedDetailMessageKey()));
13291341
assertThat(logRecords, containsFine(getJobDeletedMessageKey()));

0 commit comments

Comments
 (0)