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

YARN-6932. Fix TestFederationRMFailoverProxyProvider test case failure. 

(cherry picked from commit 0542e6f86e)
This commit is contained in:
Subru Krishnan 2017-08-03 14:18:03 -07:00 committed by Arun Suresh
parent bb6a1aa5fa
commit 8746a65e78
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
View File

@ -72,8 +72,7 @@ public class FederationRMFailoverProxyProvider<T>
this.rmProxy = proxy;
this.protocol = proto;
this.rmProxy.checkAllowedProtocols(this.protocol);
String clusterId =
configuration.get(YarnConfiguration.RM_CLUSTER_ID);
String clusterId = configuration.get(YarnConfiguration.RM_CLUSTER_ID);
Preconditions.checkNotNull(clusterId, "Missing RM ClusterId");
this.subClusterId = SubClusterId.newInstance(clusterId);
this.facade = facade.getInstance();
@ -197,16 +196,17 @@ public class FederationRMFailoverProxyProvider<T>
}
private void closeInternal(T currentProxy) {
if ((currentProxy != null) && (currentProxy instanceof Closeable)) {
try {
((Closeable) currentProxy).close();
} catch (IOException e) {
LOG.warn("Exception while trying to close proxy", e);
if (currentProxy != null) {
if (currentProxy instanceof Closeable) {
try {
((Closeable) currentProxy).close();
} catch (IOException e) {
LOG.warn("Exception while trying to close proxy", e);
}
} else {
RPC.stopProxy(currentProxy);
}
} else {
RPC.stopProxy(currentProxy);
}
}
/**