Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-11173. Improve error messages for some KeyShell commands. 

(cherry picked from commit fae266bbf1)
This commit is contained in:
Andrew Wang 2014-11-25 16:13:32 -08:00
parent 915176c4e7
commit 8018d1af58
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -34,6 +34,8 @@ Release 2.7.0 - UNRELEASED
HADOOP-11291. Log the cause of SASL connection failures.
(Stephen Chu via cnauroth)
HADOOP-11173. Improve error messages for some KeyShell commands. (wang)
OPTIMIZATIONS
HADOOP-11323. WritableComparator#compare keeps reference to byte array.

14
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyShell.java
View File

@ -298,7 +298,7 @@ public class KeyShell extends Configured implements Tool {
}
} catch (IOException e) {
out.println("Cannot list keys for KeyProvider: " + provider
+ ": " + e.getMessage());
+ ": " + e.toString());
throw e;
}
}
@ -350,12 +350,12 @@ public class KeyShell extends Configured implements Tool {
printProviderWritten();
} catch (NoSuchAlgorithmException e) {
out.println("Cannot roll key: " + keyName + " within KeyProvider: "
+ provider);
+ provider + ". " + e.toString());
throw e;
}
} catch (IOException e1) {
out.println("Cannot roll key: " + keyName + " within KeyProvider: "
+ provider);
+ provider + ". " + e1.toString());
throw e1;
}
}
@ -422,7 +422,7 @@ public class KeyShell extends Configured implements Tool {
out.println(keyName + " has been successfully deleted.");
printProviderWritten();
} catch (IOException e) {
out.println(keyName + " has not been deleted.");
out.println(keyName + " has not been deleted. " + e.toString());
throw e;
}
}
@ -484,13 +484,13 @@ public class KeyShell extends Configured implements Tool {
+ options.toString() + ".");
printProviderWritten();
} catch (InvalidParameterException e) {
out.println(keyName + " has not been created. " + e.getMessage());
out.println(keyName + " has not been created. " + e.toString());
throw e;
} catch (IOException e) {
out.println(keyName + " has not been created. " + e.getMessage());
out.println(keyName + " has not been created. " + e.toString());
throw e;
} catch (NoSuchAlgorithmException e) {
out.println(keyName + " has not been created. " + e.getMessage());
out.println(keyName + " has not been created. " + e.toString());
throw e;
}
}