Skip to content

Commit f63cf6b

Browse files
rjeberhardrjeberhard
committed
Remove diagnostics
1 parent 95de737 commit f63cf6b

File tree

4 files changed

+0
-99
lines changed

4 files changed

+0
-99
lines changed

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
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;
8079
import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.CLUSTER_CHANGED;
8180
import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.CLUSTER_CREATED;
8281
import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.DOMAIN_CHANGED;
@@ -982,15 +981,7 @@ private void handleAddedDomain(DomainResource domain) {
982981
}
983982

984983
private void handleModifiedDomain(DomainResource domain) {
985-
986-
// TEST
987-
LOGGER.severe("**** RJE: domain modified, " + print(domain));
988-
989984
if (!domain.isGenerationLaterThanObservedGeneration()) {
990-
991-
// TEST
992-
LOGGER.severe("**** RJE: no make right, " + print(domain));
993-
994985
return;
995986
}
996987
LOGGER.fine(MessageKeys.WATCH_DOMAIN, domain.getDomainUid());

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
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;
9493
import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.DOMAIN_FAILED;
9594
import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.DOMAIN_ROLL_STARTING;
9695
import static oracle.kubernetes.weblogic.domain.model.DomainConditionType.AVAILABLE;
@@ -376,11 +375,6 @@ public StatusReplaceResponseStep(DomainStatusUpdaterStep updaterStep,
376375
public Result onSuccess(Packet packet, KubernetesApiResponse<DomainResource> callResponse) {
377376
if (callResponse.getObject() != null) {
378377
DomainPresenceInfo info = (DomainPresenceInfo) packet.get(ProcessingConstants.DOMAIN_PRESENCE_INFO);
379-
380-
// TEST
381-
DomainResource domain = callResponse.getObject();
382-
LOGGER.severe("**** RJE: after patch, " + print(domain));
383-
384378
info.setDomain(callResponse.getObject());
385379
}
386380
return doNext(createClusterResourceStatusUpdaterStep(getNext()), packet);
@@ -528,10 +522,6 @@ private Step getCallStep(DomainResource oldDomain, DomainStatus status) {
528522
.withMetadata(oldDomain.getMetadata())
529523
.withSpec(null)
530524
.withStatus(status);
531-
532-
// TEST
533-
LOGGER.severe("**** RJE: domain update status OLD, " + print(oldDomain) + "; NEW, " + print(newDomain));
534-
535525
return RequestBuilder.DOMAIN.updateStatus(newDomain, DomainResource::getStatus,
536526
domainStatusUpdaterStep.createResponseStep(this));
537527
}

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

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -761,57 +761,12 @@ public DomainResource getDomain() {
761761
return domain.get();
762762
}
763763

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-
803764
/**
804765
* Sets the domain.
805766
*
806767
* @param domain Domain
807768
*/
808769
public void setDomain(DomainResource domain) {
809-
810-
// TEST
811-
if (domain != null && domain.getMetadata() != null) {
812-
LOGGER.severe("**** RJE: setting domain, " + print(domain));
813-
}
814-
815770
this.domain.set(domain);
816771
}
817772

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

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
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;
7978
import static oracle.kubernetes.operator.watcher.JobWatcher.getFailedReason;
8079
import static oracle.kubernetes.weblogic.domain.model.DomainFailureReason.INTROSPECTION;
8180

@@ -271,35 +270,11 @@ public Result onSuccess(Packet packet, KubernetesApiResponse<T> callResponse) {
271270
packet.put(DOMAIN_INTROSPECTOR_JOB, job);
272271
}
273272

274-
// TEST
275-
if (job != null) {
276-
LOGGER.severe("**** RJE: verifying existing job, " + printJob(job)
277-
+ ", domain " + print(getDomain()));
278-
} else {
279-
LOGGER.severe("**** RJE: verifying existing job, NO JOB "
280-
+ ", domain " + print(getDomain()));
281-
}
282-
283273
if (isInProgressJobOutdated(job)) {
284-
285-
// TEST
286-
LOGGER.severe("**** RJE: job is outdated, " + printJob(job)
287-
+ ", domain " + print(getDomain()));
288-
289274
return doNext(cleanUpAndReintrospect(getNext()), packet);
290275
} else if (job != null) {
291-
292-
// TEST
293-
LOGGER.severe("**** RJE: processing existing, " + printJob(job)
294-
+ ", domain " + print(getDomain()));
295-
296276
return doNext(processExistingIntrospectorJob(getNext()), packet);
297277
} else if (isIntrospectionNeeded(packet)) {
298-
299-
// TEST
300-
LOGGER.severe("**** RJE: new introspection, domain "
301-
+ print(getDomain()));
302-
303278
return doNext(createIntrospectionSteps(getNext()), packet);
304279
} else {
305280
return doNext(packet);
@@ -489,18 +464,8 @@ private class CheckForFailedIntrospectorStep extends Step {
489464
Step.chain(createIntrospectionFailureSteps(getFailedReason(domainIntrospectorJob), domainIntrospectorJob),
490465
cleanUpAndReintrospect(getNext())), packet);
491466
}
492-
493-
// TEST
494-
LOGGER.severe("**** RJE: job complete, " + printJob(domainIntrospectorJob)
495-
+ ", domain " + print(getDomain()));
496-
497467
if (JobWatcher.isComplete(domainIntrospectorJob)) {
498468
if (isOutdated(domainIntrospectorJob)) {
499-
500-
// TEST
501-
LOGGER.severe("**** RJE: job outdated; replace, " + printJob(domainIntrospectorJob)
502-
+ ", domain " + print(getDomain()));
503-
504469
return doNext(cleanUpAndReintrospect(getNext()), packet);
505470
}
506471
return doNext(createRemoveFailuresStep(getNext()), packet);

0 commit comments

Comments
 (0)