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

HDFS-3856. TestHDFSServerPorts failure is causing surefire fork failure. Contributed by Colin Patrick McCabe 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377935 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-08-28 01:42:52 +00:00
parent a1c556ca19
commit 7abd25795b
2 changed files with 6 additions and 3 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

@ -513,6 +513,9 @@ Release 2.0.1-alpha - UNRELEASED
HDFS-3731. Release upgrade must handle blocks being written from 1.0. HDFS-3731. Release upgrade must handle blocks being written from 1.0.
(Colin Patrick McCabe via eli) (Colin Patrick McCabe via eli)
HDFS-3856. TestHDFSServerPorts failure is causing surefire fork failure.
(Colin Patrick McCabe via eli)
BREAKDOWN OF HDFS-3042 SUBTASKS BREAKDOWN OF HDFS-3042 SUBTASKS
HDFS-2185. HDFS portion of ZK-based FailoverController (todd) HDFS-2185. HDFS portion of ZK-based FailoverController (todd)

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
View File

@ -514,13 +514,13 @@ public class NameNode {
} }
private void startTrashEmptier(Configuration conf) throws IOException { private void startTrashEmptier(Configuration conf) throws IOException {
long trashInterval = namesystem.getServerDefaults().getTrashInterval(); long trashInterval =
conf.getLong(FS_TRASH_INTERVAL_KEY, FS_TRASH_INTERVAL_DEFAULT);
if (trashInterval == 0) { if (trashInterval == 0) {
return; return;
} else if (trashInterval < 0) { } else if (trashInterval < 0) {
throw new IOException("Cannot start tresh emptier with negative interval." throw new IOException("Cannot start tresh emptier with negative interval."
+ " Set " + CommonConfigurationKeys.FS_TRASH_INTERVAL_KEY + " to a" + " Set " + FS_TRASH_INTERVAL_KEY + " to a positive value.");
+ " positive value.");
} }
this.emptier = new Thread(new Trash(conf).getEmptier(), "Trash Emptier"); this.emptier = new Thread(new Trash(conf).getEmptier(), "Trash Emptier");
this.emptier.setDaemon(true); this.emptier.setDaemon(true);