YARN-6103. Log updates for ZKRMStateStore (Contributed by Daniel Sturman via Daniel Templeton)

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java

@@ -610,10 +610,12 @@ public class ZKRMStateStore extends RMStateStore {
     } else {
       safeCreate(nodeUpdatePath, appStateData, zkAcl,
           CreateMode.PERSISTENT);
+      if (LOG.isDebugEnabled()) {
         LOG.debug(appId + " znode didn't exist. Created a new znode to"
             + " update the application state.");
       }
     }
+  }
 
   @Override
   protected synchronized void storeApplicationAttemptStateInternal(
@@ -655,10 +657,12 @@ public class ZKRMStateStore extends RMStateStore {
     } else {
       safeCreate(nodeUpdatePath, attemptStateData, zkAcl,
           CreateMode.PERSISTENT);
+      if (LOG.isDebugEnabled()) {
         LOG.debug(appAttemptId + " znode didn't exist. Created a new znode to"
             + " update the application attempt state.");
       }
     }
+  }
 
   @Override
   protected synchronized void removeApplicationAttemptInternal(
@@ -736,8 +740,10 @@ public class ZKRMStateStore extends RMStateStore {
     } else {
       // in case znode doesn't exist
       addStoreOrUpdateOps(trx, rmDTIdentifier, renewDate, false);
+      if (LOG.isDebugEnabled()) {
         LOG.debug("Attempted to update a non-existing znode " + nodeRemovePath);
       }
+    }
 
     trx.commit();
   }
@@ -753,12 +759,12 @@ public class ZKRMStateStore extends RMStateStore {
     ByteArrayOutputStream seqOs = new ByteArrayOutputStream();
 
     try (DataOutputStream seqOut = new DataOutputStream(seqOs)) {
-      if (LOG.isDebugEnabled()) {
-        LOG.debug((isUpdate ? "Storing " : "Updating ") + "RMDelegationToken_"
-            + rmDTIdentifier.getSequenceNumber());
-      }
 
       if (isUpdate) {
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("Updating RMDelegationToken_"
+              + rmDTIdentifier.getSequenceNumber());
+        }
         trx.setData(nodeCreatePath, identifierData.toByteArray(), -1);
       } else {
         trx.create(nodeCreatePath, identifierData.toByteArray(), zkAcl,
@@ -767,8 +773,7 @@ public class ZKRMStateStore extends RMStateStore {
         seqOut.writeInt(rmDTIdentifier.getSequenceNumber());
 
         if (LOG.isDebugEnabled()) {
-          LOG.debug((isUpdate ? "Storing " : "Updating ")
-              + dtSequenceNumberPath + ". SequenceNumber: "
+          LOG.debug("Storing " + dtSequenceNumberPath + ". SequenceNumber: "
               + rmDTIdentifier.getSequenceNumber());
         }