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

svn merge -c 1520126 merging from trunk to branch-2 to fix HADOOP-9932. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520127 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kihwal Lee 2013-09-04 19:59:52 +00:00
parent 6ebdbd4a0a
commit 2935b50d85
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -179,6 +179,8 @@ Release 2.1.1-beta - UNRELEASED
HADOOP-9924. FileUtil.createJarWithClassPath() does not generate relative HADOOP-9924. FileUtil.createJarWithClassPath() does not generate relative
classpath correctly. (Shanyu Zhao via ivanmi) classpath correctly. (Shanyu Zhao via ivanmi)
HADOOP-9932. Improper synchronization in RetryCache. (kihwal)
Release 2.1.0-beta - 2013-08-22 Release 2.1.0-beta - 2013-08-22
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

24
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RetryCache.java
View File

@ -76,6 +76,12 @@ public class RetryCache {
this.expirationTime = expirationTime; 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) { private static int hashCode(long value) {
return (int)(value ^ (value >>> 32)); return (int)(value ^ (value >>> 32));
} }
@ -147,6 +153,12 @@ public class RetryCache {
this.payload = payload; 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 equals to avoid findbugs warnings */
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
@ -253,19 +265,21 @@ public class RetryCache {
*/ */
public void addCacheEntry(byte[] clientId, int callId) { public void addCacheEntry(byte[] clientId, int callId) {
CacheEntry newEntry = new CacheEntry(clientId, callId, System.nanoTime() CacheEntry newEntry = new CacheEntry(clientId, callId, System.nanoTime()
+ expirationTime); + expirationTime, true);
newEntry.completed(true); synchronized(this) {
set.put(newEntry); set.put(newEntry);
} }
}
public void addCacheEntryWithPayload(byte[] clientId, int callId, public void addCacheEntryWithPayload(byte[] clientId, int callId,
Object payload) { Object payload) {
CacheEntry newEntry = new CacheEntryWithPayload(clientId, callId, payload,
System.nanoTime() + expirationTime);
// since the entry is loaded from editlog, we can assume it succeeded. // since the entry is loaded from editlog, we can assume it succeeded.
newEntry.completed(true); CacheEntry newEntry = new CacheEntryWithPayload(clientId, callId, payload,
System.nanoTime() + expirationTime, true);
synchronized(this) {
set.put(newEntry); set.put(newEntry);
} }
}
private static CacheEntry newEntry(long expirationTime) { private static CacheEntry newEntry(long expirationTime) {
return new CacheEntry(Server.getClientId(), Server.getCallId(), return new CacheEntry(Server.getClientId(), Server.getCallId(),