big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-17263. RBF: Fix client ls trash path cannot get except default nameservices trash path (#6291) Contributed by liuguanghua.

Browse Source 
Reviewed-by: Inigo Goiri <inigoiri@apache.org>
Reviewed-by: He Xiaoqiao <hexiaoqiao@apache.org>
Signed-off-by: Shilun Fan <slfan1989@apache.org>
This commit is contained in:
LiuGuH 2023-11-30 22:46:50 +08:00 committed by GitHub
parent 5cda162a80
commit 0417c1c633
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 62 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MountTableResolver.java
View File

@ -357,7 +357,7 @@ public void refreshEntries(final Collection<MountTable> entries) {
@VisibleForTesting
public static boolean isTrashPath(String path) throws IOException {
Pattern pattern = Pattern.compile(
"^" + getTrashRoot() + TRASH_PATTERN + "/");
"^" + getTrashRoot() + TRASH_PATTERN);
return pattern.matcher(path).find();
}

2
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterClientProtocol.java
View File

@ -943,7 +943,7 @@ public DirectoryListing getListing(String src, byte[] startAfter,
}
}
if (!namenodeListingExists && nnListing.size() == 0) {
if (!namenodeListingExists && nnListing.size() == 0 && children == null) {
// NN returns a null object if the directory cannot be found and has no
// listing. If we didn't retrieve any NN listing data, and there are no
// mount points here, return null.

60
hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterTrash.java
View File

@ -64,12 +64,17 @@ public class TestRouterTrash {
private static MountTableResolver mountTable;
private static FileSystem routerFs;
private static FileSystem nnFs;
private static FileSystem nnFs1;
private static final String TEST_USER = "test-trash";
private static MiniRouterDFSCluster.NamenodeContext nnContext;
private static MiniRouterDFSCluster.NamenodeContext nnContext1;
private static String ns0;
private static String ns1;
private static final String MOUNT_POINT = "/home/data";
private static final String FILE = MOUNT_POINT + "/file1";
private static final String MOUNT_POINT1 = "/data1/test1";
private static final String MOUNT_POINT2 = "/data2/test2";
private static final String FILE1 = MOUNT_POINT1 + "/file1";
private static final String TRASH_ROOT = "/user/" + TEST_USER + "/.Trash";
private static final String CURRENT = "/Current";
@ -96,6 +101,8 @@ public static void globalSetUp() throws Exception {
routerFs = routerContext.getFileSystem();
nnContext = cluster.getNamenode(ns0, null);
nnFs = nnContext.getFileSystem();
nnContext1 = cluster.getNamenode(ns1, null);
nnFs1 = nnContext1.getFileSystem();
Router router = routerContext.getRouter();
mountTable = (MountTableResolver) router.getSubclusterResolver();
}
@ -227,6 +234,57 @@ public void testMoveToTrashWithKerberosUser() throws IOException,
assertEquals(1, fileStatuses.length);
}
@Test
public void testMultipleMountPoint() throws IOException,
URISyntaxException, InterruptedException {
MountTable addEntry = MountTable.newInstance(MOUNT_POINT,
Collections.singletonMap(ns0, MOUNT_POINT));
MountTable addEntry1 = MountTable.newInstance(MOUNT_POINT1,
Collections.singletonMap(ns1, MOUNT_POINT1));
MountTable addEntry2 = MountTable.newInstance(MOUNT_POINT2,
Collections.singletonMap(ns1, MOUNT_POINT2));
assertTrue(addMountTable(addEntry));
assertTrue(addMountTable(addEntry1));
assertTrue(addMountTable(addEntry2));
DFSClient client = nnContext.getClient();
client.setOwner("/", TEST_USER, TEST_USER);
DFSClient client1 = nnContext1.getClient();
client1.setOwner("/", TEST_USER, TEST_USER);
UserGroupInformation ugi = UserGroupInformation.
createRemoteUser(TEST_USER);
client = nnContext.getClient(ugi);
client.mkdirs(MOUNT_POINT, new FsPermission("777"), true);
client.create(FILE, true);
client1 = nnContext1.getClient(ugi);
client1.mkdirs(MOUNT_POINT1, new FsPermission("777"), true);
client1.create(FILE1, true);
client1.mkdirs(MOUNT_POINT2, new FsPermission("777"), true);
// Move two different nameservice file to trash.
Configuration routerConf = routerContext.getConf();
FileSystem fs =
DFSTestUtil.getFileSystemAs(ugi, routerConf);
Trash trash = new Trash(fs, routerConf);
assertTrue(trash.moveToTrash(new Path(FILE)));
assertTrue(trash.moveToTrash(new Path(FILE1)));
// Client user see global trash view， wo should see all three mount point.
FileStatus[] fileStatuses = fs.listStatus(new Path("/user/test-trash/.Trash/Current/"));
assertEquals(3, fileStatuses.length);
// This should return empty fileStatuses rather than NotFound Exception.
fileStatuses = fs.listStatus(new Path("/user/test-trash/.Trash/Current/" + MOUNT_POINT2));
assertEquals(0, fileStatuses.length);
client1.delete("/user", true);
}
@Test
public void testDeleteToTrashExistMountPoint() throws IOException,
URISyntaxException, InterruptedException {
@ -280,6 +338,8 @@ public void testDeleteToTrashExistMountPoint() throws IOException,
public void testIsTrashPath() throws IOException {
UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
assertNotNull(ugi);
assertTrue(MountTableResolver.isTrashPath(
"/user/" + ugi.getUserName() + "/.Trash/Current"));
assertTrue(MountTableResolver.isTrashPath(
"/user/" + ugi.getUserName() + "/.Trash/Current" + MOUNT_POINT));
assertTrue(MountTableResolver.isTrashPath(