You are viewing a plain text version of this content. The canonical link for it is here.

Posted to mapreduce-commits@hadoop.apache.org by vi...@apache.org on 2013/06/16 22:34:02 UTC

svn commit: r1493578 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java

Author: vinodkv
Date: Sun Jun 16 20:34:02 2013
New Revision: 1493578

URL: http://svn.apache.org/r1493578
Log:
YARN-829. Renamed RMTokenSelector to be RMDelegationTokenSelector. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1493577 ../../trunk/

Modified:
    hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java?rev=1493578&r1=1493577&r2=1493578&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java Sun Jun 16 20:34:02 2013
@@ -82,7 +82,7 @@ import org.apache.hadoop.yarn.exceptions
 import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
 import org.apache.hadoop.yarn.factories.RecordFactory;
 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.ProtoUtils;
 
@@ -187,7 +187,7 @@ public class YARNRunner implements Clien
        * 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
        */
-      RMTokenSelector tokenSelector = new RMTokenSelector();
+      RMDelegationTokenSelector tokenSelector = new RMDelegationTokenSelector();
       Text service = SecurityUtil.buildTokenService(resMgrDelegate
           .getConnectAddress());
       if (tokenSelector.selectToken(service, ts.getAllTokens()) != null) {