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 aa...@apache.org on 2022/10/11 07:14:48 UTC
[hadoop] branch branch-3.3 updated: HDFS-16628. RBF: Correct target directory when move to trash for kerberos login user. (#4974)
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 760144f1352 HDFS-16628. RBF: Correct target directory when move to trash for kerberos login user. (#4974)
760144f1352 is described below
commit 760144f1352bd82d5fea3cc9894e7e1dcba68905
Author: Xing Lin <li...@gmail.com>
AuthorDate: Tue Oct 11 00:14:39 2022 -0700
HDFS-16628. RBF: Correct target directory when move to trash for kerberos login user. (#4974)
Signed-off-by: Akira Ajisaka <aa...@apache.org>
---
.../federation/resolver/MountTableResolver.java | 2 +-
.../server/federation/router/TestRouterTrash.java | 38 ++++++++++++++++++++++
2 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MountTableResolver.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MountTableResolver.java
index 0b6e599194f..e1d58f45a39 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MountTableResolver.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MountTableResolver.java
@@ -359,7 +359,7 @@ public class MountTableResolver
public static String getTrashRoot() throws IOException {
// Gets the Trash directory for the current user.
return FileSystem.USER_HOME_PREFIX + "/" +
- RouterRpcServer.getRemoteUser().getUserName() + "/" +
+ RouterRpcServer.getRemoteUser().getShortUserName() + "/" +
FileSystem.TRASH_PREFIX;
}
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterTrash.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterTrash.java
index acd7b87a14b..dfb8c33c72d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterTrash.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterTrash.java
@@ -189,6 +189,44 @@ public class TestRouterTrash {
assertEquals(2, fileStatuses.length);
}
+ @Test
+ public void testMoveToTrashWithKerberosUser() throws IOException,
+ URISyntaxException, InterruptedException {
+ //Constructs the structure of the KerBoers user name
+ String kerberosUser = "randomUser/dev@HADOOP.COM";
+ UserGroupInformation ugi = UserGroupInformation.createRemoteUser(kerberosUser);
+ MountTable addEntry = MountTable.newInstance(MOUNT_POINT,
+ Collections.singletonMap(ns1, MOUNT_POINT));
+ assertTrue(addMountTable(addEntry));
+ // current user client
+ MiniRouterDFSCluster.NamenodeContext nn1Context = cluster.getNamenode(ns1, null);
+ DFSClient currentUserClientNs0 = nnContext.getClient();
+ DFSClient currentUserClientNs1 = nn1Context.getClient();
+
+ currentUserClientNs0.setOwner("/", ugi.getShortUserName(), ugi.getShortUserName());
+ currentUserClientNs1.setOwner("/", ugi.getShortUserName(), ugi.getShortUserName());
+
+ // test user client
+ DFSClient testUserClientNs1 = nn1Context.getClient(ugi);
+ testUserClientNs1.mkdirs(MOUNT_POINT, new FsPermission("777"), true);
+ assertTrue(testUserClientNs1.exists(MOUNT_POINT));
+ // create test file
+ testUserClientNs1.create(FILE, true);
+ Path filePath = new Path(FILE);
+
+ FileStatus[] fileStatuses = routerFs.listStatus(filePath);
+ assertEquals(1, fileStatuses.length);
+ assertEquals(ugi.getShortUserName(), fileStatuses[0].getOwner());
+ // move to Trash
+ Configuration routerConf = routerContext.getConf();
+ FileSystem fs = DFSTestUtil.getFileSystemAs(ugi, routerConf);
+ Trash trash = new Trash(fs, routerConf);
+ assertTrue(trash.moveToTrash(filePath));
+ fileStatuses = fs.listStatus(
+ new Path("/user/" + ugi.getShortUserName() + "/.Trash/Current" + MOUNT_POINT));
+ assertEquals(1, fileStatuses.length);
+ }
+
@Test
public void testDeleteToTrashExistMountPoint() throws IOException,
URISyntaxException, InterruptedException {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org