Skip to content

HDFS-15862. Make TestViewfsWithNfs3.testNfsRenameSingleNN() idempotent #2724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aajisaka merged 3 commits into from
Dec 8, 2021
Merged

HDFS-15862. Make TestViewfsWithNfs3.testNfsRenameSingleNN() idempotent #2724

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
743d4ff
Rename file back to original in TestViewfsWithNfs3.testNfsRenameSingl…
lzx404243-school Nov 16, 2020
75d6bb6
Addressed review feedbacks
lzx404243 Aug 31, 2021
6c75449
Address additional review
lzx404243 Nov 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...ect/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/TestViewfsWithNfs3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,6 @@ public static void setup() throws Exception {
DFSTestUtil.createFile(viewFs, new Path("/hdfs2/write2"), 0, (short) 1, 0);
DFSTestUtil.createFile(viewFs, new Path("/hdfs1/renameMultiNN"),
0, (short) 1, 0);
DFSTestUtil.createFile(viewFs, new Path("/hdfs1/renameSingleNN"),
0, (short) 1, 0);
}

@AfterClass
Expand Down Expand Up @@ -307,6 +305,8 @@ public void testNfsRenameMultiNN() throws Exception {

@Test (timeout = 60000)
public void testNfsRenameSingleNN() throws Exception {
DFSTestUtil.createFile(viewFs, new Path("/hdfs1/renameSingleNN"),
0, (short) 1, 0);
HdfsFileStatus fromFileStatus = nn1.getRpcServer().getFileInfo("/user1");
int fromNNId = Nfs3Utils.getNamenodeId(config, hdfs1.getUri());
FileHandle fromHandle =
Expand All @@ -316,6 +316,8 @@ public void testNfsRenameSingleNN() throws Exception {
nn1.getRpcServer().getFileInfo("/user1/renameSingleNN");
Assert.assertEquals(statusBeforeRename.isDirectory(), false);

Path successFilePath = new Path("/user1/renameSingleNNSucess");
hdfs1.delete(successFilePath, false);
testNfsRename(fromHandle, "renameSingleNN",
fromHandle, "renameSingleNNSucess", Nfs3Status.NFS3_OK);

Expand Down