Repository: incubator-slider Updated Branches: refs/heads/develop 058e64d49 -> 6da1533b6
SLIDER-1010 SliderAM rejecting launch in a secure cluster âclaims user not on a keytab Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ff3e6c7e Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ff3e6c7e Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ff3e6c7e Branch: refs/heads/develop Commit: ff3e6c7e57215c1fc02df55bf35dff569932d2d8 Parents: 058e64d Author: Steve Loughran <[email protected]> Authored: Wed Dec 9 11:28:20 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Wed Dec 9 11:28:20 2015 +0000 ---------------------------------------------------------------------- .../server/appmaster/SliderAppMaster.java | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ff3e6c7e/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java index 18d5bfa..c5f7946 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java @@ -1097,20 +1097,20 @@ public class SliderAppMaster extends AbstractSliderLaunchedService protected void validateLoginUser(UserGroupInformation user) throws SliderException { if (!user.isFromKeytab()) { - throw new SliderException(SliderExitCodes.EXIT_BAD_STATE, "User is " - + "not based on a keytab in a secure deployment."); - } - Credentials credentials = - user.getCredentials(); - Iterator<Token<? extends TokenIdentifier>> iter = + log.error("User is not holding on a keytab in a secure deployment:" + + " slider will fail as tokens expire"); + } else { + Credentials credentials = user.getCredentials(); + Iterator<Token<? extends TokenIdentifier>> iter = credentials.getAllTokens().iterator(); - while (iter.hasNext()) { - Token<? extends TokenIdentifier> token = iter.next(); - log.info("Token {}", token.getKind()); - if (token.getKind().equals( + while (iter.hasNext()) { + Token<? extends TokenIdentifier> token = iter.next(); + log.info("Token {}", token.getKind()); + if (token.getKind().equals( DelegationTokenIdentifier.HDFS_DELEGATION_KIND)) { - log.info("HDFS delegation token {}. Removing...", token); - iter.remove(); + log.info("HDFS delegation token {}. Removing...", token); + iter.remove(); + } } } }
