YARN-3497. ContainerManagementProtocolProxy modifies IPC timeout conf without making a copy. Contributed by Jason Lowe

This commit is contained in:
Jian He 2015-04-20 10:38:27 -07:00
parent c17cd4f7c1
commit f967fd2f21
2 changed files with 5 additions and 2 deletions

View File

@ -244,6 +244,9 @@ Release 2.7.1 - UNRELEASED
YARN-3487. CapacityScheduler scheduler lock obtained unnecessarily when YARN-3487. CapacityScheduler scheduler lock obtained unnecessarily when
calling getQueue (Jason Lowe via wangda) calling getQueue (Jason Lowe via wangda)
YARN-3497. ContainerManagementProtocolProxy modifies IPC timeout conf
without making a copy. (Jason Lowe via jianhe)
Release 2.7.0 - UNRELEASED Release 2.7.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -67,7 +67,7 @@ public ContainerManagementProtocolProxy(Configuration conf) {
public ContainerManagementProtocolProxy(Configuration conf, public ContainerManagementProtocolProxy(Configuration conf,
NMTokenCache nmTokenCache) { NMTokenCache nmTokenCache) {
this.conf = conf; this.conf = new Configuration(conf);
this.nmTokenCache = nmTokenCache; this.nmTokenCache = nmTokenCache;
maxConnectedNMs = maxConnectedNMs =
@ -88,7 +88,7 @@ public ContainerManagementProtocolProxy(Configuration conf,
cmProxy = Collections.emptyMap(); cmProxy = Collections.emptyMap();
// Connections are not being cached so ensure connections close quickly // Connections are not being cached so ensure connections close quickly
// to avoid creating thousands of RPC client threads on large clusters. // to avoid creating thousands of RPC client threads on large clusters.
conf.setInt( this.conf.setInt(
CommonConfigurationKeysPublic.IPC_CLIENT_CONNECTION_MAXIDLETIME_KEY, CommonConfigurationKeysPublic.IPC_CLIENT_CONNECTION_MAXIDLETIME_KEY,
0); 0);
} }