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 zh...@apache.org on 2015/10/17 05:43:22 UTC
[21/50] [abbrv] hadoop git commit: HDFS-9238. Update
TestFileCreation.testLeaseExpireHardLimit() to avoid using
DataNodeTestUtils.getFile(). (Tony Wu via lei)
HDFS-9238. Update TestFileCreation.testLeaseExpireHardLimit() to avoid using DataNodeTestUtils.getFile(). (Tony Wu via lei)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ba3c1978
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ba3c1978
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ba3c1978
Branch: refs/heads/HDFS-7966
Commit: ba3c19787849a9cb9f805e2b6ef0f8485aa68f06
Parents: dfa7848
Author: Lei Xu <le...@apache.org>
Authored: Wed Oct 14 13:10:26 2015 -0700
Committer: Lei Xu <le...@apache.org>
Committed: Wed Oct 14 13:10:26 2015 -0700
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/hdfs/TestFileCreation.java | 14 +++-----------
2 files changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba3c1978/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 e6cd98f..127cb0d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1524,6 +1524,9 @@ Release 2.8.0 - UNRELEASED
HDFS-1172. Blocks in newly completed files are considered under-replicated
too quickly. (Masatake Iwasaki via jing9)
+ HDFS-9238. Update TestFileCreation.testLeaseExpireHardLimit() to avoid using
+ DataNodeTestUtils.getFile(). (Tony Wu via lei)
+
OPTIMIZATIONS
HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba3c1978/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java
index 4ad066f..09df4bd 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java
@@ -40,10 +40,9 @@ import static org.junit.Assume.assumeTrue;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
-import java.io.File;
import java.io.FileNotFoundException;
-import java.io.FileReader;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.net.InetSocketAddress;
@@ -66,7 +65,6 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys;
import org.apache.hadoop.hdfs.client.HdfsDataOutputStream;
-import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
import org.apache.hadoop.hdfs.protocol.ExtendedBlock;
import org.apache.hadoop.hdfs.protocol.HdfsConstants;
@@ -1000,15 +998,9 @@ public class TestFileCreation {
for(DatanodeInfo datanodeinfo: locatedblock.getLocations()) {
DataNode datanode = cluster.getDataNode(datanodeinfo.getIpcPort());
ExtendedBlock blk = locatedblock.getBlock();
- Block b = DataNodeTestUtils.getFSDataset(datanode).getStoredBlock(
- blk.getBlockPoolId(), blk.getBlockId());
- final File blockfile = DataNodeTestUtils.getFile(datanode,
- blk.getBlockPoolId(), b.getBlockId());
- System.out.println("blockfile=" + blockfile);
- if (blockfile != null) {
- BufferedReader in = new BufferedReader(new FileReader(blockfile));
+ try (BufferedReader in = new BufferedReader(new InputStreamReader(
+ datanode.getFSDataset().getBlockInputStream(blk, 0)))) {
assertEquals("something", in.readLine());
- in.close();
successcount++;
}
}