You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ay...@apache.org on 2020/11/04 18:46:05 UTC
[ozone] branch master updated: HDDS-4431. Improve output message
for key/bucket list command. (#1553)
This is an automated email from the ASF dual-hosted git repository.
ayushsaxena 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 046c2a8 HDDS-4431. Improve output message for key/bucket list command. (#1553)
046c2a8 is described below
commit 046c2a807619cc2fb529d239846bf901f7081a1a
Author: Ethan Rose <33...@users.noreply.github.com>
AuthorDate: Wed Nov 4 13:45:44 2020 -0500
HDDS-4431. Improve output message for key/bucket list command. (#1553)
---
.../main/smoketest/security/ozone-secure-fs.robot | 2 +-
.../java/org/apache/hadoop/ozone/shell/Shell.java | 24 ++++++++++++++--------
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/smoketest/security/ozone-secure-fs.robot b/hadoop-ozone/dist/src/main/smoketest/security/ozone-secure-fs.robot
index af9c9ae..f9cac67 100644
--- a/hadoop-ozone/dist/src/main/smoketest/security/ozone-secure-fs.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/security/ozone-secure-fs.robot
@@ -118,7 +118,7 @@ Test native authorizer
Execute kdestroy
Run Keyword Kinit test user testuser2 testuser2.keytab
${result} = Execute And Ignore Error ozone sh bucket list /${volume3}/
- Should contain ${result} PERMISSION_DENIED org.apache.hadoop.ozone.om.exceptions.OMException: User testuser2/scm@EXAMPLE.COM doesn't have LIST permission to access volume
+ Should contain ${result} PERMISSION_DENIED User testuser2/scm@EXAMPLE.COM doesn't have LIST permission to access volume
Execute ozone sh volume addacl ${volume3} -a user:testuser2/scm@EXAMPLE.COM:l
Execute ozone sh bucket list /${volume3}/
Execute ozone sh volume getacl /${volume3}/
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/Shell.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/Shell.java
index 2016886..6fd0aa3 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/Shell.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/Shell.java
@@ -44,16 +44,24 @@ public abstract class Shell extends GenericCli {
@Override
protected void printError(Throwable errorArg) {
+ OMException omException = null;
+
if (errorArg instanceof OMException) {
- if (isVerbose()) {
- errorArg.printStackTrace(System.err);
- } else {
- OMException omException = (OMException) errorArg;
- System.err.println(String
- .format("%s %s", omException.getResult().name(),
- omException.getMessage()));
- }
+ omException = (OMException) errorArg;
+ } else if (errorArg.getCause() instanceof OMException) {
+ // If the OMException occurred in a method that could not throw a
+ // checked exception (like an Iterator implementation), it will be
+ // chained to an unchecked exception and thrown.
+ omException = (OMException) errorArg.getCause();
+ }
+
+ if (omException != null && !isVerbose()) {
+ // In non-verbose mode, reformat OMExceptions as error messages to the
+ // user.
+ System.err.println(String.format("%s %s", omException.getResult().name(),
+ omException.getMessage()));
} else {
+ // Prints the stack trace when in verbose mode.
super.printError(errorArg);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org