Skip to content

Commit 9f9df83

Browse files
committed
Updates to child fiber bread crumbs
1 parent 795f531 commit 9f9df83

File tree

1 file changed

+21
-15
lines changed
  • operator/src/main/java/oracle/kubernetes/operator/work

1 file changed

+21
-15
lines changed

operator/src/main/java/oracle/kubernetes/operator/work/Fiber.java

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ private synchronized void addBreadCrumb(BreadCrumb bc) {
808808

809809
private synchronized void recordBreadCrumb() {
810810
if (breadCrumbs != null) {
811-
if (parent == null || parent.isDone()) {
811+
if (parent == null) {
812812
StringBuilder sb = new StringBuilder();
813813
writeBreadCrumb(sb);
814814

@@ -822,22 +822,20 @@ private synchronized void recordBreadCrumb() {
822822

823823
private synchronized void writeBreadCrumb(StringBuilder sb) {
824824
if (breadCrumbs != null) {
825-
if (parent == null || parent.isDone()) {
826-
sb.append('[');
827-
Iterator<BreadCrumb> it = breadCrumbs.iterator();
828-
BreadCrumb previous = null;
829-
while (it.hasNext()) {
830-
BreadCrumb bc = it.next();
831-
if (!bc.isMarker()) {
832-
if (previous != null) {
833-
sb.append(previous.isMarker() ? "][" : ",");
834-
}
835-
bc.writeTo(sb);
825+
sb.append('[');
826+
Iterator<BreadCrumb> it = breadCrumbs.iterator();
827+
BreadCrumb previous = null;
828+
while (it.hasNext()) {
829+
BreadCrumb bc = it.next();
830+
if (!bc.isMarker()) {
831+
if (previous != null) {
832+
sb.append(previous.isMarker() ? "][" : ",");
836833
}
837-
previous = bc;
834+
bc.writeTo(sb);
838835
}
839-
sb.append(']');
836+
previous = bc;
840837
}
838+
sb.append(']');
841839
}
842840
}
843841

@@ -887,7 +885,15 @@ public ChildFiberBreadCrumb(Fiber child) {
887885

888886
@Override
889887
public void writeTo(StringBuilder sb) {
890-
child.writeBreadCrumb(sb);
888+
sb.append("{child-");
889+
sb.append(child.id);
890+
sb.append(": ");
891+
if (child.status.get() == NOT_COMPLETE) {
892+
sb.append("not-complete");
893+
} else {
894+
child.writeBreadCrumb(sb);
895+
}
896+
sb.append("}");
891897
}
892898
}
893899

0 commit comments

Comments
 (0)