From 8f6fb6a8a3989b2aca64be379add9877a4570b0b Mon Sep 17 00:00:00 2001 From: Matthew Foley Date: Tue, 20 Sep 2011 00:45:25 +0000 Subject: [PATCH] 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 | 3 +++ .../org/apache/hadoop/hdfs/server/namenode/Checkpointer.java | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index dac0c60cd58..69248077184 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/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) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java index 5e73d93ab3c..99e7ab7234f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java +++ b/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"); } /**