Skip to content

HDFS-16749. RBF: Gets the wrong directory information from Trash #5039

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

Closed
zhangxiping1 wants to merge 1 commit into from
Closed

HDFS-16749. RBF: Gets the wrong directory information from Trash #5039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions ...f/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MountTableResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,9 +511,6 @@ public MountTable getMountPoint(final String path) throws IOException {
public List<String> getMountPoints(final String str) throws IOException {
verifyMountTable();
String path = RouterAdmin.normalizeFileSystemPath(str);
if (isTrashPath(path)) {
path = subtractTrashCurrentPath(path);
}
readLock.lock();
try {
String from = path;
Expand Down
22 changes: 22 additions & 0 deletions ...fs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterTrash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,4 +332,26 @@ public void testSubtractTrashCurrentPath() throws IOException {
assertEquals("/.Trash/Current", MountTableResolver.
subtractTrashCurrentPath("/.Trash/Current"));
}

@Test
public void testListStatusTrashPath() throws IOException, URISyntaxException {
UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
MountTable addEntry1 =
MountTable.newInstance("/user/a", Collections.singletonMap(ns0, "/user/a"));
MountTable addEntry2 =
MountTable.newInstance("/user/b", Collections.singletonMap(ns0, "/user/b"));
assertTrue(addMountTable(addEntry1));
assertTrue(addMountTable(addEntry2));

// Current user client
DFSClient client = nnContext.getClient();
String trashPath = "/user/" + ugi.getShortUserName() + "/.Trash/Current/user/c";
client.mkdirs(trashPath, new FsPermission("777"), true);
assertTrue(client.exists(trashPath));

// Request to the router
String trashPathParent = "/user/" + ugi.getShortUserName() + "/.Trash/Current/user";
FileStatus[] fileStatuses = routerFs.listStatus(new Path(trashPathParent));
assertEquals(1, fileStatuses.length);
}
}