Author: kihwal
Date: Wed Sep 4 20:00:44 2013
New Revision: 1520128
URL: http://svn.apache.org/r1520128
Log:
svn merge -c 1520126 merging from trunk to branch-2.1-beta to fix HADOOP-9932.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RetryCache.java
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1520128&r1=1520127&r2=1520128&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Sep 4 20:00:44 2013
@@ -101,6 +101,8 @@ Release 2.1.1-beta - UNRELEASED
HADOOP-9924. FileUtil.createJarWithClassPath() does not generate relative
classpath correctly. (Shanyu Zhao via ivanmi)
+ HADOOP-9932. Improper synchronization in RetryCache. (kihwal)
+
Release 2.1.0-beta - 2013-08-22
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RetryCache.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RetryCache.java?rev=1520128&r1=1520127&r2=1520128&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RetryCache.java
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RetryCache.java
Wed Sep 4 20:00:44 2013
@@ -76,6 +76,12 @@ public class RetryCache {
this.expirationTime = expirationTime;
}
+ CacheEntry(byte[] clientId, int callId, long expirationTime,
+ boolean success) {
+ this(clientId, callId, expirationTime);
+ this.state = success ? SUCCESS : FAILED;
+ }
+
private static int hashCode(long value) {
return (int)(value ^ (value >>> 32));
}
@@ -147,6 +153,12 @@ public class RetryCache {
this.payload = payload;
}
+ CacheEntryWithPayload(byte[] clientId, int callId, Object payload,
+ long expirationTime, boolean success) {
+ super(clientId, callId, expirationTime, success);
+ this.payload = payload;
+ }
+
/** Override equals to avoid findbugs warnings */
@Override
public boolean equals(Object obj) {
@@ -253,18 +265,20 @@ public class RetryCache {
*/
public void addCacheEntry(byte[] clientId, int callId) {
CacheEntry newEntry = new CacheEntry(clientId, callId, System.nanoTime()
- + expirationTime);
- newEntry.completed(true);
- set.put(newEntry);
+ + expirationTime, true);
+ synchronized(this) {
+ set.put(newEntry);
+ }
}
public void addCacheEntryWithPayload(byte[] clientId, int callId,
Object payload) {
- CacheEntry newEntry = new CacheEntryWithPayload(clientId, callId, payload,
- System.nanoTime() + expirationTime);
// since the entry is loaded from editlog, we can assume it succeeded.
- newEntry.completed(true);
- set.put(newEntry);
+ CacheEntry newEntry = new CacheEntryWithPayload(clientId, callId, payload,
+ System.nanoTime() + expirationTime, true);
+ synchronized(this) {
+ set.put(newEntry);
+ }
}
private static CacheEntry newEntry(long expirationTime) {
