You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2015/12/01 23:37:50 UTC
[33/46] hadoop git commit: HDFS-9407. TestFileTruncate should not use
fixed NN port. Contributed by Brahma Reddy Battula.
HDFS-9407. TestFileTruncate should not use fixed NN port. Contributed by Brahma Reddy Battula.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fc799ab1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fc799ab1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fc799ab1
Branch: refs/heads/HDFS-1312
Commit: fc799ab16cc62b04fef5a416af30e4ae845dd7a5
Parents: e3d6739
Author: Konstantin V Shvachko <sh...@apache.org>
Authored: Wed Nov 25 13:52:09 2015 -0800
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Wed Nov 25 13:52:09 2015 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 7 +++++--
.../apache/hadoop/hdfs/server/namenode/TestFileTruncate.java | 6 ------
2 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc799ab1/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 46a286b..8fc911c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -2378,8 +2378,8 @@ Release 2.8.0 - UNRELEASED
HDFS-9435. TestBlockRecovery#testRBWReplicas is failing intermittently.
(Rakesh R via waltersu4549)
- HDFS-9433. DFS getEZForPath API on a non-existent file should throw FileNotFoundException
- (Rakesh R via umamahesh)
+ HDFS-9433. DFS getEZForPath API on a non-existent file should throw
+ FileNotFoundException (Rakesh R via umamahesh)
HDFS-6101. TestReplaceDatanodeOnFailure fails occasionally.
(Wei-Chiu Chuang via cnauroth)
@@ -2397,6 +2397,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9459. hadoop-hdfs-native-client fails test build on Windows after
transition to ctest. (Chris Nauroth via wheat9)
+ HDFS-9407. TestFileTruncate should not use fixed NN port.
+ (Brahma Reddy Battula via shv)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc799ab1/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java
index a642492..1c739fc 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java
@@ -50,7 +50,6 @@ import org.apache.hadoop.hdfs.DFSTestUtil;
import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.hdfs.HdfsConfiguration;
import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys;
import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.protocol.HdfsConstants;
import org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction;
@@ -60,7 +59,6 @@ import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfoContiguous;
import org.apache.hadoop.hdfs.server.common.HdfsServerConstants;
import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.StartupOption;
import org.apache.hadoop.hdfs.server.datanode.FsDatasetTestUtils;
-import org.apache.hadoop.net.ServerSocketUtil;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.util.Time;
@@ -104,7 +102,6 @@ public class TestFileTruncate {
cluster = new MiniDFSCluster.Builder(conf)
.format(true)
.numDataNodes(DATANODE_NUM)
- .nameNodePort(HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT)
.waitSafeMode(true)
.build();
fs = cluster.getFileSystem();
@@ -1230,9 +1227,6 @@ public class TestFileTruncate {
NameNode.doRollback(conf, false);
cluster = new MiniDFSCluster.Builder(conf).numDataNodes(DATANODE_NUM)
.format(false)
- .nameNodePort(
- ServerSocketUtil.getPort(
- HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT, 10))
.startupOption(o==StartupOption.ROLLBACK ? StartupOption.REGULAR : o)
.dnStartupOption(o!=StartupOption.ROLLBACK ? StartupOption.REGULAR : o)
.build();