merge HDFS-2347 to v0.23

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172928 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -705,6 +705,9 @@ Release 0.23.0 - Unreleased
 
   BUG FIXES
 
+    HDFS-2347. Fix checkpointTxnCount's comment about editlog size. 
+    (Uma Maheswara Rao G via mattf)
+
     HDFS-2011. Removal and restoration of storage directories on checkpointing
     failure doesn't work properly. (Ravi Prakash via mattf)
 

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java

@@ -60,7 +60,8 @@ class Checkpointer extends Daemon {
   private BackupNode backupNode;
   volatile boolean shouldRun;
   private long checkpointPeriod;    // in seconds
-  private long checkpointTxnCount;    // size (in MB) of current Edit Log
+  // Transactions count to trigger the checkpoint
+  private long checkpointTxnCount; 
 
   private String infoBindAddress;
 
@@ -108,7 +109,7 @@ class Checkpointer extends Daemon {
 
     LOG.info("Checkpoint Period : " + checkpointPeriod + " secs " +
              "(" + checkpointPeriod/60 + " min)");
-    LOG.info("Log Size Trigger  : " + checkpointTxnCount + " txns ");
+    LOG.info("Transactions count is  : " + checkpointTxnCount + ", to trigger checkpoint");
   }
 
   /**