Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Matthew Foley 2011-09-20 00:45:25 +00:00
parent e2ba4d85dc
commit 8f6fb6a8a3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -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)

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

@ -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");
}
/**