Merge pull request #553 from oracle/bread-crumb

Fix bread crumb printing

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/Main.java

@@ -240,6 +240,11 @@ public StartNamespacesStep(Collection<String> targetNamespaces) {
       this.targetNamespaces = targetNamespaces;
     }
 
+    @Override
+    protected String getDetail() {
+      return String.join(",", targetNamespaces);
+    }
+
     @Override
     public NextAction apply(Packet packet) {
       // check for any existing resources and add the watches on them

operator/src/main/java/oracle/kubernetes/operator/calls/AsyncRequestStep.java

@@ -70,6 +70,11 @@ public AsyncRequestStep(
     next.setPrevious(this);
   }
 
+  @Override
+  protected String getDetail() {
+    return requestParams.call;
+  }
+
   @Override
   public NextAction apply(Packet packet) {
     // clear out earlier results

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

@@ -63,6 +63,11 @@ private RollingStep(Map<String, StepAndPacket> rolling, Step next) {
       this.rolling = rolling;
     }
 
+    @Override
+    protected String getDetail() {
+      return String.join(",", rolling.keySet());
+    }
+
     @Override
     public NextAction apply(Packet packet) {
       DomainPresenceInfo info = packet.getSPI(DomainPresenceInfo.class);

operator/src/main/java/oracle/kubernetes/operator/steps/ManagedServerUpIteratorStep.java

@@ -6,6 +6,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import oracle.kubernetes.operator.ProcessingConstants;
@@ -31,6 +32,15 @@ public ManagedServerUpIteratorStep(Collection<ServerStartupInfo> c, Step next) {
     this.c = c;
   }
 
+  @Override
+  protected String getDetail() {
+    List<String> serversToStart = new ArrayList<>();
+    for (ServerStartupInfo ssi : c) {
+      serversToStart.add(ssi.serverConfig.getName());
+    }
+    return String.join(",", serversToStart);
+  }
+
   @Override
   public NextAction apply(Packet packet) {
     Collection<StepAndPacket> startDetails = new ArrayList<>();

operator/src/main/java/oracle/kubernetes/operator/steps/ServerDownIteratorStep.java

@@ -31,6 +31,11 @@ public List<String> getServersToStop() {
     return Collections.unmodifiableList(serverNames);
   }
 
+  @Override
+  protected String getDetail() {
+    return String.join(",", getServersToStop());
+  }
+
   @Override
   public NextAction apply(Packet packet) {
     Collection<StepAndPacket> startDetails = new ArrayList<>();

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

@@ -828,13 +828,13 @@ private synchronized void writeBreadCrumb(StringBuilder sb) {
         BreadCrumb previous = null;
         while (it.hasNext()) {
           BreadCrumb bc = it.next();
-          if (previous != null) {
-            sb.append(previous.isMarker() ? "][" : ",");
-          }
-          previous = bc;
           if (!bc.isMarker()) {
+            if (previous != null) {
+              sb.append(previous.isMarker() ? "][" : ",");
+            }
             bc.writeTo(sb);
           }
+          previous = bc;
         }
         sb.append(']');
       }

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

@@ -71,7 +71,13 @@ String getName() {
     if (idx >= 0) {
       name = name.substring(idx + 1, name.length());
     }
-    return name.endsWith("Step") ? name.substring(0, name.length() - 4) : name;
+    name = name.endsWith("Step") ? name.substring(0, name.length() - 4) : name;
+    String detail = getDetail();
+    return detail != null ? name + "(" + detail + ")" : name;
+  }
+
+  protected String getDetail() {
+    return null;
   }
 
   /**