storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [12/50] storm git commit: Merge branch 'STORM-346' of https://github.com/Parth-Brahmbhatt/incubator-storm into STORM-346
Date Thu, 13 Nov 2014 19:37:07 GMT
Merge branch 'STORM-346' of https://github.com/Parth-Brahmbhatt/incubator-storm into STORM-346

Conflicts:
	storm-core/src/jvm/backtype/storm/Config.java

STORM-346: Oozie style delegation tokens for HDFS


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1a1df087
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1a1df087
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1a1df087

Branch: refs/heads/master
Commit: 1a1df087c1a0f2e15c5e670d8192d66d12d1bae8
Parents: fa40fbc 1fedcd5
Author: Robert (Bobby) Evans <bobby@apache.org>
Authored: Thu Aug 7 10:09:12 2014 -0500
Committer: Robert (Bobby) Evans <bobby@apache.org>
Committed: Thu Aug 7 10:09:12 2014 -0500

----------------------------------------------------------------------
 SECURITY.md                                     |  12 +
 .../src/clj/backtype/storm/MockAutoCred.clj     |  58 ++++
 .../src/clj/backtype/storm/daemon/nimbus.clj    |  44 ++--
 storm-core/src/jvm/backtype/storm/Config.java   |  24 +-
 .../storm/security/INimbusCredentialPlugin.java |  47 ++++
 .../backtype/storm/security/auth/AuthUtils.java |  24 ++
 .../security/auth/ICredentialsRenewer.java      |   3 +-
 .../storm/security/auth/hadoop/AutoHDFS.java    | 262 +++++++++++++++++++
 .../storm/security/auth/kerberos/AutoTGT.java   |   2 +-
 .../test/clj/backtype/storm/nimbus_test.clj     |  37 ++-
 10 files changed, 490 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/1a1df087/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/storm/blob/1a1df087/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/Config.java
index 94d1cb3,03bc438..6ddc98a
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@@ -1216,25 -1192,25 +1222,41 @@@ public class Config extends HashMap<Str
      public static final String TOPOLOGY_ISOLATED_MACHINES = "topology.isolate.machines";
      public static final Object TOPOLOGY_ISOLATED_MACHINES_SCHEMA = Number.class;
  
+     /**
+      * HDFS information, used to get the delegation token on behalf of the topology
+      * submitter user and renew the tokens. see {@link backtype.storm.security.auth.hadoop.AutoHDFS}
+      * kerberos principal name with realm should be provided.
+      */
+     public static final Object TOPOLOGY_HDFS_PRINCIPAL = "topology.hdfs.user";
+     public static final Object TOPOLOGY_HDFS_PRINCIPAL_SCHEMA = String.class;
+ 
+     /**
+      * The HDFS URI to be used by AutoHDFS.java to grab the delegation token on topology
+      * submitter user's behalf by the nimbus. If this is not provided the default URI provided
+      * in the hdfs configuration files will be used.
+      */
+     public static final Object TOPOLOGY_HDFS_URI = "topology.hdfs.uri";
+     public static final Object TOPOLOGY_HDFS_URI_SCHEMA = String.class;
+ 
 +    public static void setClasspath(Map conf, String cp) {
 +        conf.put(Config.TOPOLOGY_CLASSPATH, cp);
 +    }
 +
 +    public void setClasspath(String cp) {
 +        setClasspath(this, cp);
 +    }
 +
 +    public static void setEnvironment(Map conf, Map env) {
 +        conf.put(Config.TOPOLOGY_ENVIRONMENT, env);
 +    }
 +
 +    public void setEnvironment(Map env) {
 +        setEnvironment(this, env);
 +    }
 +
      public static void setDebug(Map conf, boolean isOn) {
          conf.put(Config.TOPOLOGY_DEBUG, isOn);
 -    } 
 +    }
  
      public void setDebug(boolean isOn) {
          setDebug(this, isOn);

http://git-wip-us.apache.org/repos/asf/storm/blob/1a1df087/storm-core/src/jvm/backtype/storm/security/auth/AuthUtils.java
----------------------------------------------------------------------


Mime
View raw message