big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-1642. RMDTRenewer#getRMClient should use ClientRMProxy (kasha)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561990 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Karthik Kambatla 2014-01-28 08:26:33 +00:00
parent a99d4201e6
commit 8006467e58
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -463,6 +463,8 @@ Release 2.4.0 - UNRELEASED
YARN-1575. Public localizer crashes with "Localized unkown resource" YARN-1575. Public localizer crashes with "Localized unkown resource"
(jlowe) (jlowe)
YARN-1642. RMDTRenewer#getRMClient should use ClientRMProxy (kasha)
Release 2.3.0 - UNRELEASED Release 2.3.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

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

@ -37,8 +37,8 @@
import org.apache.hadoop.yarn.api.ApplicationClientProtocol; import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenRequest; import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenRequest;
import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenRequest; 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.exceptions.YarnException;
import org.apache.hadoop.yarn.ipc.YarnRPC;
import org.apache.hadoop.yarn.util.Records; import org.apache.hadoop.yarn.util.Records;
/** /**
@ -138,7 +138,7 @@ public void cancel(Token<?> token, Configuration conf) throws IOException,
} }
private static ApplicationClientProtocol getRmClient(Token<?> token, private static ApplicationClientProtocol getRmClient(Token<?> token,
Configuration conf) { Configuration conf) throws IOException {
InetSocketAddress addr = SecurityUtil.getTokenServiceAddr(token); InetSocketAddress addr = SecurityUtil.getTokenServiceAddr(token);
if (localSecretManager != null) { if (localSecretManager != null) {
// return null if it's our token // return null if it's our token
@ -151,8 +151,7 @@ private static ApplicationClientProtocol getRmClient(Token<?> token,
return null; return null;
} }
} }
final YarnRPC rpc = YarnRPC.create(conf); return ClientRMProxy.createRMProxy(conf, ApplicationClientProtocol.class);
return (ApplicationClientProtocol)rpc.getProxy(ApplicationClientProtocol.class, addr, conf);
} }
// get renewer so we can always renew our own tokens // get renewer so we can always renew our own tokens