Author: kasha
Date: Tue Jan 28 08:32:23 2014
New Revision: 1561993
URL: http://svn.apache.org/r1561993
Log:
YARN-1642. RMDTRenewer#getRMClient should use ClientRMProxy (kasha)
Modified:
hadoop/common/branches/branch-2.3/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2.3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenIdentifier.java
Modified: hadoop/common/branches/branch-2.3/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-yarn-project/CHANGES.txt?rev=1561993&r1=1561992&r2=1561993&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.3/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.3/hadoop-yarn-project/CHANGES.txt Tue Jan
28 08:32:23 2014
@@ -348,6 +348,8 @@ Release 2.4.0 - UNRELEASED
YARN-1575. Public localizer crashes with "Localized unkown resource"
(jlowe)
+ YARN-1642. RMDTRenewer#getRMClient should use ClientRMProxy (kasha)
+
Release 2.3.0 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenIdentifier.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenIdentifier.java?rev=1561993&r1=1561992&r2=1561993&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenIdentifier.java
(original)
+++
hadoop/common/branches/branch-2.3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenIdentifier.java
Tue Jan 28 08:32:23 2014
@@ -37,8 +37,8 @@ import org.apache.hadoop.security.token.
import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenRequest;
import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenRequest;
+import org.apache.hadoop.yarn.client.ClientRMProxy;
import org.apache.hadoop.yarn.exceptions.YarnException;
-import org.apache.hadoop.yarn.ipc.YarnRPC;
import org.apache.hadoop.yarn.util.Records;
/**
@@ -138,7 +138,7 @@ public class RMDelegationTokenIdentifier
}
private static ApplicationClientProtocol getRmClient(Token<?> token,
- Configuration conf) {
+ Configuration conf) throws IOException {
InetSocketAddress addr = SecurityUtil.getTokenServiceAddr(token);
if (localSecretManager != null) {
// return null if it's our token
@@ -151,8 +151,7 @@ public class RMDelegationTokenIdentifier
return null;
}
}
- final YarnRPC rpc = YarnRPC.create(conf);
- return
(ApplicationClientProtocol)rpc.getProxy(ApplicationClientProtocol.class, addr,
conf);
+ return ClientRMProxy.createRMProxy(conf,
ApplicationClientProtocol.class);
}
// get renewer so we can always renew our own tokens
