show dump on change; remove double checksum

Author: russgold

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

@@ -14,6 +14,7 @@
 public class AnnotationHelper {
   private static final boolean DEBUG = true;
   static final String SHA256_ANNOTATION = "weblogic.sha256";
+  private static final String HASHED_STRING = "hashedString";
   private static Function<V1Pod, String> HASH_FUNCTION =
       pod -> DigestUtils.sha256Hex(Yaml.dump(pod));
 
@@ -35,11 +36,15 @@ static void annotateForPrometheus(V1ObjectMeta meta, int httpPort) {
   static V1Pod withSha256Hash(V1Pod pod) {
     String dump = Yaml.dump(pod);
     pod.getMetadata().putAnnotationsItem(SHA256_ANNOTATION, HASH_FUNCTION.apply(pod));
-    if (DEBUG) pod.getMetadata().putAnnotationsItem("hashedString", dump);
+    if (DEBUG) pod.getMetadata().putAnnotationsItem(HASHED_STRING, dump);
     return pod;
   }
 
   static String getHash(V1Pod pod) {
     return pod.getMetadata().getAnnotations().get(SHA256_ANNOTATION);
   }
+
+  static String getDebugString(V1Pod pod) {
+    return pod.getMetadata().getAnnotations().get(HASHED_STRING);
+  }
 }

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

@@ -279,11 +279,7 @@ Step createPod(Step next) {
   }
 
   private Step createPodAsync(ResponseStep<V1Pod> response) {
-    return new CallBuilder().createPodAsync(getNamespace(), getPodModelWithChecksum(), response);
-  }
-
-  private V1Pod getPodModelWithChecksum() {
-    return AnnotationHelper.withSha256Hash(getPodModel());
+    return new CallBuilder().createPodAsync(getNamespace(), getPodModel(), response);
   }
 
   /**
@@ -367,11 +363,18 @@ private boolean mustPatchPod(V1Pod currentPod) {
   }
 
   private boolean canUseCurrentPod(V1Pod currentPod) {
-    return AnnotationHelper.getHash(getPodModel()).equals(AnnotationHelper.getHash(currentPod));
+    boolean useCurrent =
+        AnnotationHelper.getHash(getPodModel()).equals(AnnotationHelper.getHash(currentPod));
+    if (!useCurrent && AnnotationHelper.getDebugString(currentPod) != null)
+      LOGGER.info(
+          MessageKeys.POD_DUMP,
+          AnnotationHelper.getDebugString(currentPod),
+          AnnotationHelper.getDebugString(getPodModel()));
+
+    return useCurrent;
   }
 
   private String getReasonToRecycle(V1Pod currentPod) {
-
     PodCompatibility compatibility = new PodCompatibility(getPodModel(), currentPod);
     return compatibility.getIncompatibility();
   }
@@ -573,11 +576,11 @@ public NextAction onSuccess(
   // ---------------------- model methods ------------------------------
 
   private V1Pod createPodModel() {
-    return withPatchableElements(AnnotationHelper.withSha256Hash(createPodRecipe()));
+    return withNonHashedElements(AnnotationHelper.withSha256Hash(createPodRecipe()));
   }
 
   // Adds labels and annotations to a pod, skipping any whose names begin with "weblogic."
-  private V1Pod withPatchableElements(V1Pod pod) {
+  V1Pod withNonHashedElements(V1Pod pod) {
     V1ObjectMeta metadata = pod.getMetadata();
     getPodLabels()
         .entrySet()

operator/src/main/java/oracle/kubernetes/operator/logging/MessageKeys.java

@@ -150,4 +150,5 @@ private MessageKeys() {}
   public static final String CYCLING_POD = "WLSKO-0145";
   public static final String REPLICAS_EXCEEDS_TOTAL_CLUSTER_SERVER_COUNT = "WLSKO-0146";
   public static final String SYNC_RETRY = "WLSKO-0147";
+  public static final String POD_DUMP = "WLSKO-0148";
 }

operator/src/main/resources/Operator.properties

@@ -146,3 +146,4 @@ WLSKO-0144=Unable to start domain with domainUID {0} in namespace {1} after {2}
 WLSKO-0145=Replacing pod {0} because: {1}
 WLSKO-0146=Replica request of {0} exceeds the maximum dynamic server count + server count of {1} configured for cluster {2}
 WLSKO-0147=Call {0} has failed with code {1}: message {2}. It has failed {3} times and will be retried up to {4} times.
+WLSKO-0148=Current Pod dump [{0}] vs expected pod [{1}].