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

merge MAPREDUCE-3531 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214595 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Siddharth Seth 2011-12-15 02:11:19 +00:00
parent 87b8d8612c
commit e4f63a94b0
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -254,6 +254,9 @@ Release 0.23.1 - Unreleased
MAPREDUCE-3484. Fixed JobEndNotifier to not get interrupted before completing MAPREDUCE-3484. Fixed JobEndNotifier to not get interrupted before completing
all its retries. (Ravi Prakash via vinodkv) all its retries. (Ravi Prakash via vinodkv)
MAPREDUCE-3531. Fixed a race in ContainerTokenSecretManager. (Robert Joseph
Evans via sseth)
Release 0.23.0 - 2011-11-01 Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

8
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/ContainerTokenSecretManager.java
View File

@ -18,8 +18,8 @@
package org.apache.hadoop.yarn.server.security; package org.apache.hadoop.yarn.server.security;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import javax.crypto.SecretKey; import javax.crypto.SecretKey;
@ -34,9 +34,9 @@ public class ContainerTokenSecretManager extends
private static Log LOG = LogFactory private static Log LOG = LogFactory
.getLog(ContainerTokenSecretManager.class); .getLog(ContainerTokenSecretManager.class);
private Map<String, SecretKey> secretkeys = Map<String, SecretKey> secretkeys =
new HashMap<String, SecretKey>(); new ConcurrentHashMap<String, SecretKey>();
// Used by master for generation of secretyKey per host // Used by master for generation of secretyKey per host
public SecretKey createAndGetSecretKey(CharSequence hostName) { public SecretKey createAndGetSecretKey(CharSequence hostName) {
String hostNameStr = hostName.toString(); String hostNameStr = hostName.toString();