You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2017/08/09 17:36:30 UTC
[10/51] [abbrv] hadoop git commit: YARN-6932. Fix
TestFederationRMFailoverProxyProvider test case failure.
YARN-6932. Fix TestFederationRMFailoverProxyProvider test case failure.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0542e6f8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0542e6f8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0542e6f8
Branch: refs/heads/HADOOP-13345
Commit: 0542e6f86e6734f8ceea00960bebe719827136db
Parents: b8e8241
Author: Subru Krishnan <su...@apache.org>
Authored: Thu Aug 3 14:18:03 2017 -0700
Committer: Subru Krishnan <su...@apache.org>
Committed: Thu Aug 3 14:18:03 2017 -0700
----------------------------------------------------------------------
.../FederationRMFailoverProxyProvider.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0542e6f8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
index e00f8d1..c631208 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
@@ -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);
}
-
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org