SLIDER-1010: cut back on the token work and simply downgrade the exception to a log@error
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/d42242b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d42242b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d42242b4 Branch: refs/heads/develop Commit: d42242b443fe499a8eaf5535add1e531569ab872 Parents: ff3e6c7 Author: Steve Loughran <[email protected]> Authored: Wed Dec 9 17:47:08 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Wed Dec 9 17:47:08 2015 +0000 ---------------------------------------------------------------------- .../server/appmaster/SliderAppMaster.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d42242b4/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 c5f7946..ef5290b 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 @@ -1099,18 +1099,18 @@ public class SliderAppMaster extends AbstractSliderLaunchedService if (!user.isFromKeytab()) { 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 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(); } } }
