You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/05/22 21:21:45 UTC
[1/3] storm git commit: STORM-827: Allow AutoTGT to work with
storm-hdfs too.
Repository: storm
Updated Branches:
refs/heads/master 5ee4bcf16 -> d2e2d5815
STORM-827: Allow AutoTGT to work with storm-hdfs too.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/33d7747e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/33d7747e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/33d7747e
Branch: refs/heads/master
Commit: 33d7747e0f0df86f5d1c932f8e3e82279de9a23d
Parents: 512d3de
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue May 19 15:42:34 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Tue May 19 15:42:34 2015 -0500
----------------------------------------------------------------------
.../org/apache/storm/hdfs/common/security/HdfsSecurityUtil.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/33d7747e/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/security/HdfsSecurityUtil.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/security/HdfsSecurityUtil.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/security/HdfsSecurityUtil.java
index 9e390e9..86e7e3d 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/security/HdfsSecurityUtil.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/security/HdfsSecurityUtil.java
@@ -17,6 +17,8 @@
*/
package org.apache.storm.hdfs.common.security;
+import backtype.storm.security.auth.kerberos.AutoTGT;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.security.UserGroupInformation;
@@ -42,7 +44,8 @@ public class HdfsSecurityUtil {
public static void login(Map conf, Configuration hdfsConfig) throws IOException {
//If AutoHDFS is specified, do not attempt to login using keytabs, only kept for backward compatibility.
if(conf.get(TOPOLOGY_AUTO_CREDENTIALS) == null ||
- !(((List)conf.get(TOPOLOGY_AUTO_CREDENTIALS)).contains(AutoHDFS.class.getName()))) {
+ (!(((List)conf.get(TOPOLOGY_AUTO_CREDENTIALS)).contains(AutoHDFS.class.getName())) &&
+ !(((List)conf.get(TOPOLOGY_AUTO_CREDENTIALS)).contains(AutoTGT.class.getName())))) {
if (UserGroupInformation.isSecurityEnabled()) {
LOG.info("Logging in using keytab as AutoHDFS is not specified for " + TOPOLOGY_AUTO_CREDENTIALS);
String keytab = (String) conf.get(STORM_KEYTAB_FILE_KEY);
[2/3] storm git commit: Merge branch 'STORM-827' of
https://github.com/revans2/incubator-storm into STORM-827
Posted by bo...@apache.org.
Merge branch 'STORM-827' of https://github.com/revans2/incubator-storm into STORM-827
STORM-827: Allow AutoTGT to work with storm-hdfs too.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7c95a4f5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7c95a4f5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7c95a4f5
Branch: refs/heads/master
Commit: 7c95a4f5dc8ad6ad3685e8fc56009bf40d7b8de7
Parents: 5ee4bcf 33d7747
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri May 22 14:13:54 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri May 22 14:13:54 2015 -0500
----------------------------------------------------------------------
.../org/apache/storm/hdfs/common/security/HdfsSecurityUtil.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-827 to Changelog
Posted by bo...@apache.org.
Added STORM-827 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d2e2d581
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d2e2d581
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d2e2d581
Branch: refs/heads/master
Commit: d2e2d58153a19b35666c39035e445887ce032e6c
Parents: 7c95a4f
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri May 22 14:20:47 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri May 22 14:20:47 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d2e2d581/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cc8570..c3a42ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-827: Allow AutoTGT to work with storm-hdfs too.
* STORM-811: remove old metastor_db before running tests again.
* STORM-807: quote args to storm.py correctly
* STORM-796: Add support for "error" command in ShellSpout