hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jia...@apache.org
Subject hadoop git commit: YARN-3497. ContainerManagementProtocolProxy modifies IPC timeout conf without making a copy. Contributed by Jason Lowe (cherry picked from commit f967fd2f21791c5c4a5a090cc14ee88d155d2e2b)
Date Mon, 20 Apr 2015 17:41:43 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 d6105d944 -> b493ec28a


YARN-3497. ContainerManagementProtocolProxy modifies IPC timeout conf without making a copy.
Contributed by Jason Lowe
(cherry picked from commit f967fd2f21791c5c4a5a090cc14ee88d155d2e2b)

Conflicts:
	hadoop-yarn-project/CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b493ec28
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b493ec28
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b493ec28

Branch: refs/heads/branch-2.7
Commit: b493ec28a8b17db05a4aee5f850d116b397008a0
Parents: d6105d9
Author: Jian He <jianhe@apache.org>
Authored: Mon Apr 20 10:38:27 2015 -0700
Committer: Jian He <jianhe@apache.org>
Committed: Mon Apr 20 10:41:17 2015 -0700

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                                  | 3 +++
 .../yarn/client/api/impl/ContainerManagementProtocolProxy.java   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/b493ec28/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 1b74021..ea58a31 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -17,6 +17,9 @@ Release 2.7.1 - UNRELEASED
     YARN-3462. Patches applied for YARN-2424 are inconsistent between
     trunk and branch-2. (Naganarasimha G R via harsh)
 
+    YARN-3497. ContainerManagementProtocolProxy modifies IPC timeout conf
+    without making a copy. (Jason Lowe via jianhe)
+
 Release 2.7.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/b493ec28/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/ContainerManagementProtocolProxy.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/ContainerManagementProtocolProxy.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/ContainerManagementProtocolProxy.java
index eaf048d..94ebf0d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/ContainerManagementProtocolProxy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/ContainerManagementProtocolProxy.java
@@ -67,7 +67,7 @@ public class ContainerManagementProtocolProxy {
 
   public ContainerManagementProtocolProxy(Configuration conf,
       NMTokenCache nmTokenCache) {
-    this.conf = conf;
+    this.conf = new Configuration(conf);
     this.nmTokenCache = nmTokenCache;
 
     maxConnectedNMs =
@@ -88,7 +88,7 @@ public class ContainerManagementProtocolProxy {
       cmProxy = Collections.emptyMap();
       // Connections are not being cached so ensure connections close quickly
       // to avoid creating thousands of RPC client threads on large clusters.
-      conf.setInt(
+      this.conf.setInt(
           CommonConfigurationKeysPublic.IPC_CLIENT_CONNECTION_MAXIDLETIME_KEY,
           0);
     }


Mime
View raw message