Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-829. Renamed RMTokenSelector to be RMDelegationTokenSelector. Contributed by Zhijie Shen. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493577 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2013-06-16 20:33:30 +00:00
parent 7f96128e43
commit e3769ea1d2
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java
View File

@ -82,7 +82,7 @@ import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.hadoop.yarn.exceptions.YarnRuntimeException; import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factories.RecordFactory;
import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
import org.apache.hadoop.yarn.security.client.RMTokenSelector; import org.apache.hadoop.yarn.security.client.RMDelegationTokenSelector;
import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.hadoop.yarn.util.ConverterUtils;
import org.apache.hadoop.yarn.util.ProtoUtils; import org.apache.hadoop.yarn.util.ProtoUtils;
@ -187,7 +187,7 @@ public class YARNRunner implements ClientProtocol {
* note that get delegation token was called. Again this is hack for oozie * note that get delegation token was called. Again this is hack for oozie
* to make sure we add history server delegation tokens to the credentials * to make sure we add history server delegation tokens to the credentials
*/ */
RMTokenSelector tokenSelector = new RMTokenSelector(); RMDelegationTokenSelector tokenSelector = new RMDelegationTokenSelector();
Text service = SecurityUtil.buildTokenService(resMgrDelegate Text service = SecurityUtil.buildTokenService(resMgrDelegate
.getConnectAddress()); .getConnectAddress());
if (tokenSelector.selectToken(service, ts.getAllTokens()) != null) { if (tokenSelector.selectToken(service, ts.getAllTokens()) != null) {

5
hadoop-yarn-project/CHANGES.txt
View File

@ -147,11 +147,14 @@ Release 2.1.0-beta - UNRELEASED
He via vinodkv) He via vinodkv)
YARN-821. Renamed setFinishApplicationStatus to setFinalApplicationStatus in YARN-821. Renamed setFinishApplicationStatus to setFinalApplicationStatus in
FinishApplicationMasterRequest for consistency. (Jian He via vinodk) FinishApplicationMasterRequest for consistency. (Jian He via vinodkv)
YARN-787. Removed minimum resource from RegisterApplicationMasterResponse. YARN-787. Removed minimum resource from RegisterApplicationMasterResponse.
(tucu via acmurthy) (tucu via acmurthy)
YARN-829. Renamed RMTokenSelector to be RMDelegationTokenSelector. (Zhijie
Shen via vinodkv)
NEW FEATURES NEW FEATURES
YARN-482. FS: Extend SchedulingMode to intermediate queues. YARN-482. FS: Extend SchedulingMode to intermediate queues.

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientRMSecurityInfo.java
View File

@ -72,7 +72,7 @@ public class ClientRMSecurityInfo extends SecurityInfo {
@Override @Override
public Class<? extends TokenSelector<? extends TokenIdentifier>> public Class<? extends TokenSelector<? extends TokenIdentifier>>
value() { value() {
return RMTokenSelector.class; return RMDelegationTokenSelector.class;
} }
}; };
} }

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMTokenSelector.java → hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenSelector.java
View File

@ -27,11 +27,11 @@ import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.security.token.TokenIdentifier; import org.apache.hadoop.security.token.TokenIdentifier;
import org.apache.hadoop.security.token.TokenSelector; import org.apache.hadoop.security.token.TokenSelector;
public class RMTokenSelector implements public class RMDelegationTokenSelector implements
TokenSelector<RMDelegationTokenIdentifier> { TokenSelector<RMDelegationTokenIdentifier> {
private static final Log LOG = LogFactory private static final Log LOG = LogFactory
.getLog(RMTokenSelector.class); .getLog(RMDelegationTokenSelector.class);
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public Token<RMDelegationTokenIdentifier> selectToken(Text service, public Token<RMDelegationTokenIdentifier> selectToken(Text service,