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

HDFS-9852. hdfs dfs -setfacl error message is misleading (Wei-Chiu Chuang via aw) 

(cherry picked from commit b3649adf6a)
This commit is contained in:
Allen Wittenauer 2016-06-28 20:47:05 -07:00 committed by Chris Nauroth
parent c92601e981
commit 84c785036f
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/AclCommands.java
View File

@ -192,6 +192,9 @@ protected void processOptions(LinkedList<String> args) throws IOException {
boolean oneRemoveOption = cf.getOpt("b") || cf.getOpt("k"); boolean oneRemoveOption = cf.getOpt("b") || cf.getOpt("k");
boolean oneModifyOption = cf.getOpt("m") || cf.getOpt("x"); boolean oneModifyOption = cf.getOpt("m") || cf.getOpt("x");
boolean setOption = cf.getOpt("-set"); boolean setOption = cf.getOpt("-set");
boolean hasExpectedOptions = cf.getOpt("b") || cf.getOpt("k") ||
cf.getOpt("m") || cf.getOpt("x") || cf.getOpt("-set");
if ((bothRemoveOptions || bothModifyOptions) if ((bothRemoveOptions || bothModifyOptions)
|| (oneRemoveOption && oneModifyOption) || (oneRemoveOption && oneModifyOption)
|| (setOption && (oneRemoveOption || oneModifyOption))) { || (setOption && (oneRemoveOption || oneModifyOption))) {
@ -201,8 +204,13 @@ protected void processOptions(LinkedList<String> args) throws IOException {
// Only -m, -x and --set expects <acl_spec> // Only -m, -x and --set expects <acl_spec>
if (oneModifyOption || setOption) { if (oneModifyOption || setOption) {
if (args.isEmpty()) {
throw new HadoopIllegalArgumentException(
"Missing arguments: <acl_spec> <path>");
}
if (args.size() < 2) { if (args.size() < 2) {
throw new HadoopIllegalArgumentException("<acl_spec> is missing"); throw new HadoopIllegalArgumentException(
"Missing either <acl_spec> or <path>");
} }
aclEntries = AclEntry.parseAclSpec(args.removeFirst(), !cf.getOpt("x")); aclEntries = AclEntry.parseAclSpec(args.removeFirst(), !cf.getOpt("x"));
} }
@ -214,6 +222,10 @@ protected void processOptions(LinkedList<String> args) throws IOException {
throw new HadoopIllegalArgumentException("Too many arguments"); throw new HadoopIllegalArgumentException("Too many arguments");
} }
if (!hasExpectedOptions) {
throw new HadoopIllegalArgumentException(
"Expected one of -b, -k, -m, -x or --set options");
}
// In recursive mode, save a separate list of just the access ACL entries. // In recursive mode, save a separate list of just the access ACL entries.
// Only directories may have a default ACL. When a recursive operation // Only directories may have a default ACL. When a recursive operation
// encounters a file under the specified path, it must pass only the // encounters a file under the specified path, it must pass only the

4
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestAclCommands.java
View File

@ -64,6 +64,10 @@ public void testGetfaclValidations() throws Exception {
@Test @Test
public void testSetfaclValidations() throws Exception { public void testSetfaclValidations() throws Exception {
assertFalse("setfacl should fail without options",
0 == runCommand(new String[] { "-setfacl", "/" }));
assertFalse("setfacl should fail without options -b, -k, -m, -x or --set",
0 == runCommand(new String[] { "-setfacl", "-R", "/" }));
assertFalse("setfacl should fail without path", assertFalse("setfacl should fail without path",
0 == runCommand(new String[] { "-setfacl" })); 0 == runCommand(new String[] { "-setfacl" }));
assertFalse("setfacl should fail without aclSpec", assertFalse("setfacl should fail without aclSpec",