Skip to content

Commit 63bc7c2

Browse files
rjeberhardrjeberhard
committed
Adjust diagnostics
1 parent ac46c1e commit 63bc7c2

File tree

4 files changed

+93
-36
lines changed

4 files changed

+93
-36
lines changed

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
import static oracle.kubernetes.operator.KubernetesConstants.UNSCHEDULABLE_REASON;
7777
import static oracle.kubernetes.operator.ProcessingConstants.SERVER_HEALTH_MAP;
7878
import static oracle.kubernetes.operator.ProcessingConstants.SERVER_STATE_MAP;
79+
import static oracle.kubernetes.operator.helpers.DomainPresenceInfo.print;
7980
import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.CLUSTER_CHANGED;
8081
import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.CLUSTER_CREATED;
8182
import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.DOMAIN_CHANGED;
@@ -983,17 +984,12 @@ private void handleAddedDomain(DomainResource domain) {
983984
private void handleModifiedDomain(DomainResource domain) {
984985

985986
// TEST
986-
System.out.println("**** RJE: domain modified, creation: " + domain.getMetadata().getCreationTimestamp()
987-
+ ", generation: " + domain.getMetadata().getGeneration() + ", resourceVersion: "
988-
+ domain.getMetadata().getResourceVersion());
987+
LOGGER.severe("**** RJE: domain modified, " + print(domain));
989988

990989
if (!domain.isGenerationLaterThanObservedGeneration()) {
991990

992991
// TEST
993-
System.out.println("**** RJE: no make right, creation: " + domain.getMetadata().getCreationTimestamp()
994-
+ ", generation: " + domain.getMetadata().getGeneration() + ", resourceVersion: "
995-
+ domain.getMetadata().getResourceVersion() + ", observed: "
996-
+ domain.getStatus().getObservedGeneration());
992+
LOGGER.severe("**** RJE: no make right, " + print(domain));
997993

998994
return;
999995
}

‎operator/src/main/java/oracle/kubernetes/operator/DomainStatusUpdater.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
import static oracle.kubernetes.operator.WebLogicConstants.RUNNING_STATE;
9191
import static oracle.kubernetes.operator.WebLogicConstants.SHUTDOWN_STATE;
9292
import static oracle.kubernetes.operator.WebLogicConstants.SHUTTING_DOWN_STATE;
93+
import static oracle.kubernetes.operator.helpers.DomainPresenceInfo.print;
9394
import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.DOMAIN_FAILED;
9495
import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.DOMAIN_ROLL_STARTING;
9596
import static oracle.kubernetes.weblogic.domain.model.DomainConditionType.AVAILABLE;
@@ -376,11 +377,9 @@ public Result onSuccess(Packet packet, KubernetesApiResponse<DomainResource> cal
376377
if (callResponse.getObject() != null) {
377378
DomainPresenceInfo info = (DomainPresenceInfo) packet.get(ProcessingConstants.DOMAIN_PRESENCE_INFO);
378379

380+
// TEST
379381
DomainResource domain = callResponse.getObject();
380-
System.out.println("**** RJE: after patch, creation: " + domain.getMetadata().getCreationTimestamp()
381-
+ ", generation: " + domain.getMetadata().getGeneration() + ", resourceVersion: "
382-
+ domain.getMetadata().getResourceVersion()
383-
+ ", observedGeneration: " + domain.getStatus().getObservedGeneration());
382+
LOGGER.severe("**** RJE: after patch, " + print(domain));
384383

385384
info.setDomain(callResponse.getObject());
386385
}
@@ -531,13 +530,7 @@ private Step getCallStep(DomainResource oldDomain, DomainStatus status) {
531530
.withStatus(status);
532531

533532
// TEST
534-
System.out.println("**** RJE: domain update status OLD, creation: "
535-
+ oldDomain.getMetadata().getCreationTimestamp()
536-
+ ", generation: " + oldDomain.getMetadata().getGeneration() + ", resourceVersion: "
537-
+ oldDomain.getMetadata().getResourceVersion()
538-
+ "; NEW, creation: " + newDomain.getMetadata().getCreationTimestamp()
539-
+ ", generation: " + newDomain.getMetadata().getGeneration() + ", resourceVersion: "
540-
+ newDomain.getMetadata().getResourceVersion());
533+
LOGGER.severe("**** RJE: domain update status OLD, " + print(oldDomain) + "; NEW, " + print(newDomain));
541534

542535
return RequestBuilder.DOMAIN.updateStatus(newDomain, DomainResource::getStatus,
543536
domainStatusUpdaterStep.createResponseStep(this));

‎operator/src/main/java/oracle/kubernetes/operator/helpers/DomainPresenceInfo.java

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
import oracle.kubernetes.operator.MakeRightDomainOperation;
3838
import oracle.kubernetes.operator.ProcessingConstants;
3939
import oracle.kubernetes.operator.WebLogicConstants;
40+
import oracle.kubernetes.operator.logging.LoggingFacade;
41+
import oracle.kubernetes.operator.logging.LoggingFactory;
4042
import oracle.kubernetes.operator.logging.ThreadLoggingContext;
4143
import oracle.kubernetes.operator.processing.EffectiveClusterSpec;
4244
import oracle.kubernetes.operator.processing.EffectiveServerSpec;
@@ -66,6 +68,8 @@
6668
* including the scan and the Pods and Services for servers.
6769
*/
6870
public class DomainPresenceInfo extends ResourcePresenceInfo {
71+
public static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
72+
6973
private final String domainUid;
7074
private final AtomicReference<DomainResource> domain;
7175
private final AtomicBoolean isDeleting = new AtomicBoolean(false);
@@ -757,6 +761,45 @@ public DomainResource getDomain() {
757761
return domain.get();
758762
}
759763

764+
// TEST
765+
/**
766+
* Diagnostic print of domain.
767+
* @param domain Domain
768+
* @return Print
769+
*/
770+
public static String print(DomainResource domain) {
771+
StringBuilder sb = new StringBuilder();
772+
if (domain != null) {
773+
V1ObjectMeta metadata = domain.getMetadata();
774+
if (metadata != null) {
775+
sb.append("name: ");
776+
sb.append(metadata.getName());
777+
sb.append(", creation: ");
778+
sb.append(metadata.getCreationTimestamp());
779+
sb.append(", generation: ");
780+
sb.append(metadata.getGeneration());
781+
sb.append(", resourceVersion: ");
782+
sb.append(metadata.getResourceVersion());
783+
} else {
784+
sb.append("no metadata");
785+
}
786+
DomainSpec spec = domain.getSpec();
787+
if (spec != null) {
788+
sb.append(", image: ");
789+
sb.append(spec.getImage());
790+
}
791+
DomainStatus status = domain.getStatus();
792+
if (status != null) {
793+
sb.append(", observedGeneration: ");
794+
sb.append(status.getObservedGeneration());
795+
}
796+
} else {
797+
sb.append("null");
798+
}
799+
return sb.toString();
800+
}
801+
802+
760803
/**
761804
* Sets the domain.
762805
*
@@ -766,9 +809,7 @@ public void setDomain(DomainResource domain) {
766809

767810
// TEST
768811
if (domain != null && domain.getMetadata() != null) {
769-
System.out.println("**** RJE: setting domain, creation: " + domain.getMetadata().getCreationTimestamp()
770-
+ ", generation: " + domain.getMetadata().getGeneration() + ", resourceVersion: "
771-
+ domain.getMetadata().getResourceVersion());
812+
LOGGER.severe("**** RJE: setting domain, " + print(domain));
772813
}
773814

774815
this.domain.set(domain);

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

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
import static oracle.kubernetes.operator.ProcessingConstants.JOB_POD_INTROSPECT_CONTAINER_TERMINATED;
7676
import static oracle.kubernetes.operator.ProcessingConstants.JOB_POD_INTROSPECT_CONTAINER_TERMINATED_MARKER;
7777
import static oracle.kubernetes.operator.helpers.ConfigMapHelper.readExistingIntrospectorConfigMap;
78+
import static oracle.kubernetes.operator.helpers.DomainPresenceInfo.print;
7879
import static oracle.kubernetes.operator.watcher.JobWatcher.getFailedReason;
7980
import static oracle.kubernetes.weblogic.domain.model.DomainFailureReason.INTROSPECTION;
8081

@@ -208,6 +209,37 @@ private static class IntrospectionStartStep extends Step {
208209

209210
}
210211

212+
private static String printJob(V1Job job) {
213+
StringBuilder sb = new StringBuilder();
214+
if (job != null) {
215+
V1ObjectMeta metadata = job.getMetadata();
216+
if (metadata != null) {
217+
sb.append("name: ");
218+
sb.append(metadata.getName());
219+
sb.append(", creation: ");
220+
sb.append(metadata.getCreationTimestamp());
221+
sb.append(", generation: ");
222+
sb.append(metadata.getGeneration());
223+
sb.append(", resourceVersion: ");
224+
sb.append(metadata.getResourceVersion());
225+
} else {
226+
sb.append("no metadata");
227+
}
228+
V1JobSpec spec = job.getSpec();
229+
if (spec != null) {
230+
spec.getTemplate().getSpec().getContainers().forEach(c -> {
231+
sb.append(", image: ");
232+
sb.append(c.getImage());
233+
});
234+
} else {
235+
sb.append("no spec");
236+
}
237+
} else {
238+
sb.append("null");
239+
}
240+
return sb.toString();
241+
}
242+
211243
private static class IntrospectorJobStepContext extends JobStepContext {
212244

213245
IntrospectorJobStepContext(Packet packet) {
@@ -241,37 +273,32 @@ public Result onSuccess(Packet packet, KubernetesApiResponse<T> callResponse) {
241273

242274
// TEST
243275
if (job != null) {
244-
System.out.println("**** RJE: verifying existing job, creation: " + job.getMetadata().getCreationTimestamp()
245-
+ ", domain generation: " + getDomain().getMetadata().getGeneration() + ", resourceVersion: "
246-
+ getDomain().getMetadata().getResourceVersion());
276+
LOGGER.severe("**** RJE: verifying existing job, " + printJob(job)
277+
+ ", domain " + print(getDomain()));
247278
} else {
248-
System.out.println("**** RJE: verifying existing job, NO JOB "
249-
+ ", domain generation: " + getDomain().getMetadata().getGeneration() + ", resourceVersion: "
250-
+ getDomain().getMetadata().getResourceVersion());
279+
LOGGER.severe("**** RJE: verifying existing job, NO JOB "
280+
+ ", domain " + print(getDomain()));
251281
}
252282

253283
if (isInProgressJobOutdated(job)) {
254284

255285
// TEST
256-
System.out.println("**** RJE: job is outdated, creation: " + job.getMetadata().getCreationTimestamp()
257-
+ ", domain generation: " + getDomain().getMetadata().getGeneration() + ", resourceVersion: "
258-
+ getDomain().getMetadata().getResourceVersion());
286+
LOGGER.severe("**** RJE: job is outdated, " + printJob(job)
287+
+ ", domain " + print(getDomain()));
259288

260289
return doNext(cleanUpAndReintrospect(getNext()), packet);
261290
} else if (job != null) {
262291

263292
// TEST
264-
System.out.println("**** RJE: processing existing, creation: " + job.getMetadata().getCreationTimestamp()
265-
+ ", domain generation: " + getDomain().getMetadata().getGeneration() + ", resourceVersion: "
266-
+ getDomain().getMetadata().getResourceVersion());
293+
LOGGER.severe("**** RJE: processing existing, " + printJob(job)
294+
+ ", domain " + print(getDomain()));
267295

268296
return doNext(processExistingIntrospectorJob(getNext()), packet);
269297
} else if (isIntrospectionNeeded(packet)) {
270298

271299
// TEST
272-
System.out.println("**** RJE: new introspection, domain generation: "
273-
+ getDomain().getMetadata().getGeneration() + ", resourceVersion: "
274-
+ getDomain().getMetadata().getResourceVersion());
300+
LOGGER.severe("**** RJE: new introspection, domain "
301+
+ print(getDomain()));
275302

276303
return doNext(createIntrospectionSteps(getNext()), packet);
277304
} else {

0 commit comments

Comments
 (0)