SLIDER-1010: cut back on the token work and simply downgrade the exception to a log@error
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 @@
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();
}
}
}
