This is an automated email from the ASF dual-hosted git repository.
vivekratnavel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 5b4b21a HDDS-5521. Use short principal name as owner of a volume.
(#2573)
5b4b21a is described below
commit 5b4b21a05e4b2f2dfd8b4ec31e18973103bfd1f1
Author: Aswin Shakil Balasubramanian <[email protected]>
AuthorDate: Thu Aug 26 13:11:12 2021 -0400
HDDS-5521. Use short principal name as owner of a volume. (#2573)
---
.../src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java | 4 ++--
hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config | 2 +-
hadoop-ozone/dist/src/main/smoketest/ozonefs/setup.robot | 2 +-
.../org/apache/hadoop/ozone/shell/volume/CreateVolumeHandler.java | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
index e324bbd..1d831e6 100644
---
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
+++
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
@@ -302,9 +302,9 @@ public class RpcClient implements ClientProtocol {
verifySpaceQuota(volArgs.getQuotaInBytes());
String admin = volArgs.getAdmin() == null ?
- ugi.getUserName() : volArgs.getAdmin();
+ ugi.getShortUserName() : volArgs.getAdmin();
String owner = volArgs.getOwner() == null ?
- ugi.getUserName() : volArgs.getOwner();
+ ugi.getShortUserName() : volArgs.getOwner();
long quotaInNamespace = volArgs.getQuotaInNamespace();
long quotaInBytes = volArgs.getQuotaInBytes();
List<OzoneAcl> listOfAcls = new ArrayList<>();
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
index 103a997..385df54 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
@@ -50,7 +50,7 @@ HDFS-SITE.XML_dfs.datanode.address=0.0.0.0:1019
HDFS-SITE.XML_dfs.datanode.http.address=0.0.0.0:1012
CORE-SITE.XML_dfs.data.transfer.protection=authentication
CORE-SITE.XML_hadoop.security.authentication=kerberos
-CORE-SITE.XML_hadoop.security.auth_to_local="RULE:[2:$1](testuser2.*)
RULE:[2:$1@$0](.*)s/.*/root/"
+CORE-SITE.XML_hadoop.security.auth_to_local="RULE:[2:$1](testuser2.*)
RULE:[2:$1](testuser.*) RULE:[2:$1@$0](.*)s/.*/root/"
CORE-SITE.XML_hadoop.security.key.provider.path=kms://http@kms:9600/kms
diff --git a/hadoop-ozone/dist/src/main/smoketest/ozonefs/setup.robot
b/hadoop-ozone/dist/src/main/smoketest/ozonefs/setup.robot
index cb25ed9..4a59964 100644
--- a/hadoop-ozone/dist/src/main/smoketest/ozonefs/setup.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/ozonefs/setup.robot
@@ -59,7 +59,7 @@ Sanity check for FS test
${result} = Execute ozone sh volume list
Should contain ${result} ${VOLUME}
Should contain ${result} ${VOL2}
- Should Match Regexp ${result} "admin"
: "(hadoop|testuser\/scm[^@]*@EXAMPLE\.COM)"
+ Should Match Regexp ${result} "admin"
: "(hadoop|testuser)"
${result} = Execute ozone sh bucket list ${VOLUME}
Should contain ${result} ${BUCKET}
Should contain ${result}
${BUCKET2}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/CreateVolumeHandler.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/CreateVolumeHandler.java
index 64b988c..6a715ff 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/CreateVolumeHandler.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/CreateVolumeHandler.java
@@ -51,12 +51,12 @@ public class CreateVolumeHandler extends VolumeHandler {
protected void execute(OzoneClient client, OzoneAddress address)
throws IOException {
if (ownerName == null) {
- ownerName = UserGroupInformation.getCurrentUser().getUserName();
+ ownerName = UserGroupInformation.getCurrentUser().getShortUserName();
}
String volumeName = address.getVolumeName();
- String adminName = UserGroupInformation.getCurrentUser().getUserName();
+ String adminName =
UserGroupInformation.getCurrentUser().getShortUserName();
VolumeArgs.Builder volumeArgsBuilder = VolumeArgs.newBuilder()
.setAdmin(adminName)
.setOwner(ownerName);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
