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 2016/02/03 22:51:08 UTC
incubator-slider git commit: SLIDER-1026 add RM delegation token on
AM launch when there's no keytab
Repository: incubator-slider
Updated Branches:
refs/heads/develop b6b3e6276 -> 9be27e6a7
SLIDER-1026 add RM delegation token on AM launch when there's no 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/9be27e6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9be27e6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9be27e6a
Branch: refs/heads/develop
Commit: 9be27e6a74031c14a02f21696decd3afccf10620
Parents: b6b3e62
Author: Steve Loughran <st...@apache.org>
Authored: Wed Feb 3 21:39:43 2016 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Feb 3 21:39:43 2016 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/slider/client/SliderClient.java | 1 +
.../main/java/org/apache/slider/core/launch/CredentialUtils.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9be27e6a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index 21a1cb6..ed097b4 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -1930,6 +1930,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
CredentialUtils.addRMRenewableFSDelegationTokens(config,
sliderFileSystem.getFileSystem(),
credentials);
+ CredentialUtils.addRMDelegationToken(yarnClient, credentials);
} else {
log.info("Using externally supplied credentials to launch AM");
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9be27e6a/slider-core/src/main/java/org/apache/slider/core/launch/CredentialUtils.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/launch/CredentialUtils.java b/slider-core/src/main/java/org/apache/slider/core/launch/CredentialUtils.java
index 0f4f534..012a737 100644
--- a/slider-core/src/main/java/org/apache/slider/core/launch/CredentialUtils.java
+++ b/slider-core/src/main/java/org/apache/slider/core/launch/CredentialUtils.java
@@ -50,7 +50,6 @@ import java.io.Serializable;
import java.nio.ByteBuffer;
import java.text.DateFormat;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -246,7 +245,7 @@ public final class CredentialUtils {
/**
* Create and add an RM delegation token to the credentials
- * @param yarnClient
+ * @param yarnClient Yarn Client
* @param credentials to add token to
* @return the token which was added
* @throws IOException