You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by br...@apache.org on 2018/01/18 05:42:49 UTC
[1/5] hadoop git commit: HADOOP-15150. in FsShell,
UGI params should be overidden through env vars(-D arg). Contributed
by Brahma Reddy Battula.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 b0c9b8928 -> 8181367c6
refs/heads/branch-2.8 6e509ac61 -> 759b1e14f
refs/heads/branch-2.9 c614a39e9 -> 3cdc39215
refs/heads/branch-3.0 88e3ad31b -> e57540671
refs/heads/trunk cdaf92c9f -> 08332e12d
HADOOP-15150. in FsShell, UGI params should be overidden through env vars(-D arg). Contributed by Brahma Reddy Battula.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/08332e12
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/08332e12
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/08332e12
Branch: refs/heads/trunk
Commit: 08332e12d055d85472f0c9371fefe9b56bfea1ed
Parents: cdaf92c
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Thu Jan 18 10:54:32 2018 +0530
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Thu Jan 18 10:54:32 2018 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/fs/FsShell.java | 2 ++
.../java/org/apache/hadoop/fs/TestFsShellList.java | 14 ++++++++++++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/08332e12/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
index 721f4df..94d3389 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
@@ -30,6 +30,7 @@ import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.shell.Command;
import org.apache.hadoop.fs.shell.CommandFactory;
import org.apache.hadoop.fs.shell.FsCommand;
+import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.tools.TableListing;
import org.apache.hadoop.tracing.TraceUtils;
import org.apache.hadoop.util.StringUtils;
@@ -99,6 +100,7 @@ public class FsShell extends Configured implements Tool {
protected void init() throws IOException {
getConf().setQuietMode(true);
+ UserGroupInformation.setConfiguration(getConf());
if (commandFactory == null) {
commandFactory = new CommandFactory(getConf());
commandFactory.addObject(new Help(), "-help");
http://git-wip-us.apache.org/repos/asf/hadoop/blob/08332e12/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
index 03720d3..c780f41 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
@@ -75,4 +75,18 @@ public class TestFsShellList {
lsArgv = new String[]{"-ls", "-q", testRootDir.toString()};
assertThat(shell.run(lsArgv), is(0));
}
+
+ /*
+ UGI params should take effect when we pass.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testListWithUGI() throws Exception {
+ FsShell fsShell = new FsShell(new Configuration());
+ //Passing Dummy such that it should through IAE
+ fsShell.getConf()
+ .set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION,
+ "DUMMYAUTH");
+ String[] lsArgv = new String[] {"-ls", testRootDir.toString()};
+ fsShell.run(lsArgv);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[4/5] hadoop git commit: HADOOP-15150. in FsShell,
UGI params should be overidden through env vars(-D arg). Contributed
by Brahma Reddy Battula.
Posted by br...@apache.org.
HADOOP-15150. in FsShell, UGI params should be overidden through env vars(-D arg). Contributed by Brahma Reddy Battula.
(cherry picked from commit 08332e12d055d85472f0c9371fefe9b56bfea1ed)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3cdc3921
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3cdc3921
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3cdc3921
Branch: refs/heads/branch-2.9
Commit: 3cdc3921509aed53c5405289ff34e44c508da29a
Parents: c614a39
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Thu Jan 18 10:54:32 2018 +0530
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Thu Jan 18 11:02:38 2018 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/fs/FsShell.java | 2 ++
.../java/org/apache/hadoop/fs/TestFsShellList.java | 14 ++++++++++++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3cdc3921/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
index eccfbfc..0bf72c9 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
@@ -30,6 +30,7 @@ import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.shell.Command;
import org.apache.hadoop.fs.shell.CommandFactory;
import org.apache.hadoop.fs.shell.FsCommand;
+import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.tools.TableListing;
import org.apache.hadoop.tracing.TraceUtils;
import org.apache.hadoop.util.StringUtils;
@@ -92,6 +93,7 @@ public class FsShell extends Configured implements Tool {
protected void init() throws IOException {
getConf().setQuietMode(true);
+ UserGroupInformation.setConfiguration(getConf());
if (commandFactory == null) {
commandFactory = new CommandFactory(getConf());
commandFactory.addObject(new Help(), "-help");
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3cdc3921/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
index 03720d3..c780f41 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
@@ -75,4 +75,18 @@ public class TestFsShellList {
lsArgv = new String[]{"-ls", "-q", testRootDir.toString()};
assertThat(shell.run(lsArgv), is(0));
}
+
+ /*
+ UGI params should take effect when we pass.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testListWithUGI() throws Exception {
+ FsShell fsShell = new FsShell(new Configuration());
+ //Passing Dummy such that it should through IAE
+ fsShell.getConf()
+ .set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION,
+ "DUMMYAUTH");
+ String[] lsArgv = new String[] {"-ls", testRootDir.toString()};
+ fsShell.run(lsArgv);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[3/5] hadoop git commit: HADOOP-15150. in FsShell,
UGI params should be overidden through env vars(-D arg). Contributed
by Brahma Reddy Battula.
Posted by br...@apache.org.
HADOOP-15150. in FsShell, UGI params should be overidden through env vars(-D arg). Contributed by Brahma Reddy Battula.
(cherry picked from commit 08332e12d055d85472f0c9371fefe9b56bfea1ed)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8181367c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8181367c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8181367c
Branch: refs/heads/branch-2
Commit: 8181367c623f3a5a042cc7fa3ecd3047e202ea1d
Parents: b0c9b89
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Thu Jan 18 10:54:32 2018 +0530
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Thu Jan 18 10:56:58 2018 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/fs/FsShell.java | 2 ++
.../java/org/apache/hadoop/fs/TestFsShellList.java | 14 ++++++++++++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8181367c/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
index eccfbfc..0bf72c9 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
@@ -30,6 +30,7 @@ import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.shell.Command;
import org.apache.hadoop.fs.shell.CommandFactory;
import org.apache.hadoop.fs.shell.FsCommand;
+import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.tools.TableListing;
import org.apache.hadoop.tracing.TraceUtils;
import org.apache.hadoop.util.StringUtils;
@@ -92,6 +93,7 @@ public class FsShell extends Configured implements Tool {
protected void init() throws IOException {
getConf().setQuietMode(true);
+ UserGroupInformation.setConfiguration(getConf());
if (commandFactory == null) {
commandFactory = new CommandFactory(getConf());
commandFactory.addObject(new Help(), "-help");
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8181367c/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
index 03720d3..c780f41 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
@@ -75,4 +75,18 @@ public class TestFsShellList {
lsArgv = new String[]{"-ls", "-q", testRootDir.toString()};
assertThat(shell.run(lsArgv), is(0));
}
+
+ /*
+ UGI params should take effect when we pass.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testListWithUGI() throws Exception {
+ FsShell fsShell = new FsShell(new Configuration());
+ //Passing Dummy such that it should through IAE
+ fsShell.getConf()
+ .set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION,
+ "DUMMYAUTH");
+ String[] lsArgv = new String[] {"-ls", testRootDir.toString()};
+ fsShell.run(lsArgv);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/5] hadoop git commit: HADOOP-15150. in FsShell,
UGI params should be overidden through env vars(-D arg). Contributed
by Brahma Reddy Battula.
Posted by br...@apache.org.
HADOOP-15150. in FsShell, UGI params should be overidden through env vars(-D arg). Contributed by Brahma Reddy Battula.
(cherry picked from commit 08332e12d055d85472f0c9371fefe9b56bfea1ed)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e5754067
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e5754067
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e5754067
Branch: refs/heads/branch-3.0
Commit: e575406715c3b2213f7f3096b8c22a9f991db5fd
Parents: 88e3ad3
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Thu Jan 18 10:54:32 2018 +0530
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Thu Jan 18 10:56:12 2018 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/fs/FsShell.java | 2 ++
.../java/org/apache/hadoop/fs/TestFsShellList.java | 14 ++++++++++++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5754067/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
index 721f4df..94d3389 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
@@ -30,6 +30,7 @@ import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.shell.Command;
import org.apache.hadoop.fs.shell.CommandFactory;
import org.apache.hadoop.fs.shell.FsCommand;
+import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.tools.TableListing;
import org.apache.hadoop.tracing.TraceUtils;
import org.apache.hadoop.util.StringUtils;
@@ -99,6 +100,7 @@ public class FsShell extends Configured implements Tool {
protected void init() throws IOException {
getConf().setQuietMode(true);
+ UserGroupInformation.setConfiguration(getConf());
if (commandFactory == null) {
commandFactory = new CommandFactory(getConf());
commandFactory.addObject(new Help(), "-help");
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5754067/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
index 03720d3..c780f41 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
@@ -75,4 +75,18 @@ public class TestFsShellList {
lsArgv = new String[]{"-ls", "-q", testRootDir.toString()};
assertThat(shell.run(lsArgv), is(0));
}
+
+ /*
+ UGI params should take effect when we pass.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testListWithUGI() throws Exception {
+ FsShell fsShell = new FsShell(new Configuration());
+ //Passing Dummy such that it should through IAE
+ fsShell.getConf()
+ .set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION,
+ "DUMMYAUTH");
+ String[] lsArgv = new String[] {"-ls", testRootDir.toString()};
+ fsShell.run(lsArgv);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[5/5] hadoop git commit: HADOOP-15150. in FsShell,
UGI params should be overidden through env vars(-D arg). Contributed
by Brahma Reddy Battula.
Posted by br...@apache.org.
HADOOP-15150. in FsShell, UGI params should be overidden through env vars(-D arg). Contributed by Brahma Reddy Battula.
(cherry picked from commit 08332e12d055d85472f0c9371fefe9b56bfea1ed)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/759b1e14
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/759b1e14
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/759b1e14
Branch: refs/heads/branch-2.8
Commit: 759b1e14f92e51972e952d9981c545526631fcb5
Parents: 6e509ac
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Thu Jan 18 10:54:32 2018 +0530
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Thu Jan 18 11:08:25 2018 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/fs/FsShell.java | 2 ++
.../java/org/apache/hadoop/fs/TestFsShellList.java | 14 ++++++++++++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/759b1e14/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
index 97b65f2..d183b44 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
@@ -32,6 +32,7 @@ import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.shell.Command;
import org.apache.hadoop.fs.shell.CommandFactory;
import org.apache.hadoop.fs.shell.FsCommand;
+import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.tools.TableListing;
import org.apache.hadoop.tracing.TraceUtils;
import org.apache.hadoop.util.StringUtils;
@@ -92,6 +93,7 @@ public class FsShell extends Configured implements Tool {
protected void init() throws IOException {
getConf().setQuietMode(true);
+ UserGroupInformation.setConfiguration(getConf());
if (commandFactory == null) {
commandFactory = new CommandFactory(getConf());
commandFactory.addObject(new Help(), "-help");
http://git-wip-us.apache.org/repos/asf/hadoop/blob/759b1e14/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
index 03720d3..c780f41 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellList.java
@@ -75,4 +75,18 @@ public class TestFsShellList {
lsArgv = new String[]{"-ls", "-q", testRootDir.toString()};
assertThat(shell.run(lsArgv), is(0));
}
+
+ /*
+ UGI params should take effect when we pass.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testListWithUGI() throws Exception {
+ FsShell fsShell = new FsShell(new Configuration());
+ //Passing Dummy such that it should through IAE
+ fsShell.getConf()
+ .set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION,
+ "DUMMYAUTH");
+ String[] lsArgv = new String[] {"-ls", testRootDir.toString()};
+ fsShell.run(lsArgv);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org