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 vi...@apache.org on 2016/01/13 23:29:38 UTC
[10/17] hadoop git commit: HDFS-9431. DistributedFileSystem#concat
fails if the target path is relative. Contributed by Kazuho Fujii.
HDFS-9431. DistributedFileSystem#concat fails if the target path is relative. Contributed by Kazuho Fujii.
(cherry picked from commit ac1aa6c8197268ea83f44747199d560be9e299ae)
(cherry picked from commit c74e42b4a2293c8adb99b22929047a8d07242d06)
(cherry picked from commit bb6983e1531a6420e1c357d98cc469ccdfa42ab2)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/10f23dc1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/10f23dc1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/10f23dc1
Branch: refs/heads/branch-2.7.2
Commit: 10f23dc1583c3070862f6197b15a76dda391c766
Parents: 2e1c617
Author: Akira Ajisaka <aa...@apache.org>
Authored: Thu Nov 19 20:55:01 2015 +0900
Committer: Vinod Kumar Vavilapalli (I am also known as @tshooter.) <vi...@apache.org>
Committed: Wed Jan 13 11:42:45 2016 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../org/apache/hadoop/hdfs/DistributedFileSystem.java | 2 +-
.../hadoop/hdfs/server/namenode/TestHDFSConcat.java | 13 +++++++++++++
3 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/10f23dc1/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 b4b58ae..49e00fe 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1156,6 +1156,9 @@ Release 2.6.3 - UNRELEASED
HDFS-9289. Make DataStreamer#block thread safe and verify genStamp in
commitBlock. (Chang Li via kihwal)
+ HDFS-9431. DistributedFileSystem#concat fails if the target path is
+ relative. (Kazuho Fujii via aajisaka)
+
Release 2.6.2 - 2015-10-28
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/10f23dc1/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
index 86002b6..1f86d9a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
@@ -586,7 +586,7 @@ public class DistributedFileSystem extends FileSystem {
for (int i=0; i<psrcs.length; i++) {
srcsStr[i] = getPathName(srcs[i]);
}
- dfs.concat(getPathName(trg), srcsStr);
+ dfs.concat(getPathName(absF), srcsStr);
} catch (UnresolvedLinkException e) {
// Exception could be from trg or any src.
// Fully resolve trg and srcs. Fail if any of them are a symlink.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/10f23dc1/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHDFSConcat.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHDFSConcat.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHDFSConcat.java
index 4685eb9..ded0031 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHDFSConcat.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHDFSConcat.java
@@ -490,4 +490,17 @@ public class TestHDFSConcat {
Assert.assertEquals(blockSize * repl * (srcNum + 1),
summary.getSpaceConsumed());
}
+
+ @Test
+ public void testConcatRelativeTargetPath() throws IOException {
+ Path dir = new Path("/dir");
+ Path trg = new Path("trg");
+ Path src = new Path(dir, "src");
+ dfs.setWorkingDirectory(dir);
+ DFSTestUtil.createFile(dfs, trg, blockSize, REPL_FACTOR, 1);
+ DFSTestUtil.createFile(dfs, src, blockSize, REPL_FACTOR, 1);
+ dfs.concat(trg, new Path[]{src});
+ assertEquals(blockSize * 2, dfs.getFileStatus(trg).getLen());
+ assertFalse(dfs.exists(src));
+ }
}