You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2018/01/21 23:40:13 UTC

[1/2] storm git commit: STORM-2903: Fix possible NullPointerException in AbstractHadoopAutoCreds and doc cleanups

Repository: storm
Updated Branches:
  refs/heads/master 3ce7ada65 -> 163ea7186


STORM-2903: Fix possible NullPointerException in AbstractHadoopAutoCreds and doc cleanups


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

Branch: refs/heads/master
Commit: a0437f73edd4df320f60e11929cb40aef5ea35ad
Parents: 3ce7ada
Author: Manikumar Reddy <ma...@gmail.com>
Authored: Fri Jan 19 23:40:37 2018 +0530
Committer: Manikumar Reddy <ma...@gmail.com>
Committed: Sat Jan 20 00:43:06 2018 +0530

----------------------------------------------------------------------
 .../org/apache/storm/common/AbstractHadoopAutoCreds.java  | 10 +++++++---
 external/storm-hive/README.md                             |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/a0437f73/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java
----------------------------------------------------------------------
diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java
index 3c69b19..936d1fc 100644
--- a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java
+++ b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java
@@ -113,10 +113,14 @@ public abstract class AbstractHadoopAutoCreds implements IAutoCredentials, Crede
                     if (allTokens != null) {
                         for (Token<? extends TokenIdentifier> token : allTokens) {
                             try {
+                                if (token == null) {
+                                    LOG.debug("Ignoring null token");
+                                    continue;
+                                }
+
                                 LOG.debug("Current user: {}", UserGroupInformation.getCurrentUser());
-                                LOG.debug("Token from credential: {} / {}", token.toString(),
-                                        token.decodeIdentifier().getUser());
-                                
+                                LOG.debug("Token from Credentials : {}", token);
+
                                 UserGroupInformation.getCurrentUser().addToken(token);
                                 LOG.info("Added delegation tokens to UGI.");
                             } catch (IOException e) {

http://git-wip-us.apache.org/repos/asf/storm/blob/a0437f73/external/storm-hive/README.md
----------------------------------------------------------------------
diff --git a/external/storm-hive/README.md b/external/storm-hive/README.md
index cccb1a9..6e9970c 100644
--- a/external/storm-hive/README.md
+++ b/external/storm-hive/README.md
@@ -128,8 +128,8 @@ nimbus.autocredential.plugins.classes : ["org.apache.storm.hive.security.AutoHiv
 nimbus.credential.renewers.classes : ["org.apache.storm.hive.security.AutoHive", "org.apache.storm.hdfs.security.AutoHDFS"]
 nimbus.credential.renewers.freq.secs : 82800 (23 hours)
 
-hive.keytab.file: "/path/to/keytab/on/nimbus" (This is the keytab of hive super user that can impersonate other users.)
-hive.kerberos.principal: "superuser@EXAMPLE.com"
+hive.keytab.file: "/path/to/keytab/on/nimbus" (Keytab of The Hive metastore thrift server service principal. This is used to impersonate other users.)
+hive.kerberos.principal: "hive-metastore/_HOST@EXAMPLE.com" (The service principal for the metastore thrift server.)
 hive.metastore.uris: "thrift://server:9083"
 
 //hdfs configs


[2/2] storm git commit: Merge branch 'AUTO-CREDS-CLEANUP-MASTER' of https://github.com/omkreddy/storm into STORM-2903-merge

Posted by ka...@apache.org.
Merge branch 'AUTO-CREDS-CLEANUP-MASTER' of https://github.com/omkreddy/storm into STORM-2903-merge


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

Branch: refs/heads/master
Commit: 163ea7186498c426260fcf1851e12d367ed74d37
Parents: 3ce7ada a0437f7
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Jan 22 07:49:53 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Jan 22 07:49:53 2018 +0900

----------------------------------------------------------------------
 .../org/apache/storm/common/AbstractHadoopAutoCreds.java  | 10 +++++++---
 external/storm-hive/README.md                             |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------