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

HDFS-15302. Backport HDFS-15286 to branch-2.x. Contributed by hemanthboyina.

This commit is contained in:
Akira Ajisaka 2020-05-01 15:09:59 +09:00
parent 712da57658
commit b22fb90350
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirConcatOp.java
View File

@ -151,7 +151,7 @@ class FSDirConcatOp {
+ " is referred by some other reference in some snapshot.");
}
// source file cannot be the same with the target file
if (srcINode == targetINode) {
if (srcINode.equals(targetINode)) {
throw new HadoopIllegalArgumentException("concat: the src file " + src
+ " is the same with the target file " + targetIIP.getPath());
}

40
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHDFSConcat.java
View File

@ -524,4 +524,44 @@ public class TestHDFSConcat {
GenericTestUtils.assertExceptionContains(errMsg, e);
}
}
/**
* Test concat on same source and target file which is a inode reference.
*/
@Test
public void testConcatOnSameFile() throws Exception {
String dir = "/dir1";
Path trgDir = new Path(dir);
dfs.mkdirs(new Path(dir));
// create a source file
String dir2 = "/dir2";
Path srcDir = new Path(dir2);
dfs.mkdirs(srcDir);
dfs.allowSnapshot(srcDir);
Path src = new Path(srcDir, "file1");
DFSTestUtil.createFile(dfs, src, 512, (short) 2, 0);
// make the file as an Inode reference and delete the reference
dfs.createSnapshot(srcDir, "s1");
dfs.rename(src, trgDir);
dfs.deleteSnapshot(srcDir, "s1");
Path[] srcs = new Path[1];
srcs[0] = new Path(dir, "file1");
// perform concat
try {
dfs.concat(srcs[0], srcs);
} catch (RemoteException e) {
GenericTestUtils.assertExceptionContains(
"concat: the src file /dir1/file1 is the same with the target", e);
}
// the file should exists and read the file
byte[] buff = new byte[1080];
FSDataInputStream stream = dfs.open(srcs[0]);
stream.readFully(0, buff, 0, 512);
assertEquals(1, dfs.getContentSummary(new Path(dir)).getFileCount());
}
}