You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by si...@apache.org on 2020/04/01 19:52:45 UTC
[hadoop-ozone] branch master updated: HDDS-3047.
ObjectStore#listVolumesByUser and CreateVolumeHandler#call should get
principal name by default (#582)
This is an automated email from the ASF dual-hosted git repository.
siyao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 1ccf78f HDDS-3047. ObjectStore#listVolumesByUser and CreateVolumeHandler#call should get principal name by default (#582)
1ccf78f is described below
commit 1ccf78fb40a710932a6a72276e806c3774272948
Author: Siyao Meng <50...@users.noreply.github.com>
AuthorDate: Wed Apr 1 12:52:37 2020 -0700
HDDS-3047. ObjectStore#listVolumesByUser and CreateVolumeHandler#call should get principal name by default (#582)
---
.../apache/hadoop/ozone/client/ObjectStore.java | 2 +-
.../dist/src/main/smoketest/ozonefs/ozonefs.robot | 4 ++++
.../web/ozShell/volume/CreateVolumeHandler.java | 23 ++++++----------------
3 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/ObjectStore.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/ObjectStore.java
index 253aa04..b5fcd18 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/ObjectStore.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/ObjectStore.java
@@ -250,7 +250,7 @@ public class ObjectStore {
String volumePrefix, String prevVolume)
throws IOException {
if(Strings.isNullOrEmpty(user)) {
- user = UserGroupInformation.getCurrentUser().getShortUserName();
+ user = UserGroupInformation.getCurrentUser().getUserName();
}
return new VolumeIterator(user, volumePrefix, prevVolume);
}
diff --git a/hadoop-ozone/dist/src/main/smoketest/ozonefs/ozonefs.robot b/hadoop-ozone/dist/src/main/smoketest/ozonefs/ozonefs.robot
index 8be6793..fcc7809 100644
--- a/hadoop-ozone/dist/src/main/smoketest/ozonefs/ozonefs.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/ozonefs/ozonefs.robot
@@ -31,6 +31,10 @@ Create volume and bucket
Execute ozone sh bucket create o3://om/fstest2/bucket3
Check volume from ozonefs
+ ${result} = Execute ozone sh volume list
+ Should contain ${result} fstest
+ Should contain ${result} fstest2
+ Should Match Regexp ${result} "admin" : "(hadoop|testuser\/scm@EXAMPLE\.COM)"
${result} = Execute ozone fs -ls o3fs://bucket1.fstest/
Run ozoneFS tests
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/CreateVolumeHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/CreateVolumeHandler.java
index f51b2db..2647bfa 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/CreateVolumeHandler.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/CreateVolumeHandler.java
@@ -43,25 +43,20 @@ public class CreateVolumeHandler extends Handler {
@Option(names = {"--user", "-u"},
description = "Owner of of the volume")
- private String userName;
+ private String ownerName;
@Option(names = {"--quota", "-q"},
description =
"Quota of the newly created volume (eg. 1G)")
private String quota;
- @Option(names = {"--root"},
- description = "Development flag to execute the "
- + "command as the admin (hdfs) user.")
- private boolean root;
-
/**
* Executes the Create Volume.
*/
@Override
public Void call() throws Exception {
- if(userName == null) {
- userName = UserGroupInformation.getCurrentUser().getUserName();
+ if (ownerName == null) {
+ ownerName = UserGroupInformation.getCurrentUser().getUserName();
}
OzoneAddress address = new OzoneAddress(uri);
@@ -75,16 +70,10 @@ public class CreateVolumeHandler extends Handler {
System.out.printf("Volume name : %s%n", volumeName);
}
- String rootName;
- if (root) {
- rootName = "hdfs";
- } else {
- rootName = UserGroupInformation.getCurrentUser().getShortUserName();
- }
-
+ String adminName = UserGroupInformation.getCurrentUser().getUserName();
VolumeArgs.Builder volumeArgsBuilder = VolumeArgs.newBuilder()
- .setAdmin(rootName)
- .setOwner(userName);
+ .setAdmin(adminName)
+ .setOwner(ownerName);
if (quota != null) {
volumeArgsBuilder.setQuota(quota);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org