You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2015/12/09 18:46:55 UTC
[1/3] incubator-slider git commit: SLIDER-1010 SliderAM rejecting launch in a secure cluster —claims user not on a keytab
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 <st...@apache.org>
Authored: Wed Dec 9 11:28:20 2015 +0000
Committer: Steve Loughran <st...@apache.org>
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();
+ }
}
}
}
[2/3] incubator-slider git commit: SLIDER-1010: cut back on the token
work and simply downgrade the exception to a log@error
Posted by st...@apache.org.
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 <st...@apache.org>
Authored: Wed Dec 9 17:47:08 2015 +0000
Committer: Steve Loughran <st...@apache.org>
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();
}
}
}
[3/3] incubator-slider git commit: Merge branch
'feature/SLIDER-1010-kerberos-warning-in-AM' into develop
Posted by st...@apache.org.
Merge branch 'feature/SLIDER-1010-kerberos-warning-in-AM' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6da1533b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6da1533b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6da1533b
Branch: refs/heads/develop
Commit: 6da1533b667de7148f3f23405d921f01248eb9b1
Parents: 058e64d d42242b
Author: Steve Loughran <st...@apache.org>
Authored: Wed Dec 9 17:47:23 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Dec 9 17:47:23 2015 +0000
----------------------------------------------------------------------
.../java/org/apache/slider/server/appmaster/SliderAppMaster.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------