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

HADOOP-9770. Merge 1507414 from trunk. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507416 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-07-26 20:02:35 +00:00
parent b60f3a98ba
commit ebaec05891
2 changed files with 10 additions and 6 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

@ -223,6 +223,8 @@ Release 2.1.0-beta - 2013-07-02
HADOOP-9760. Move GSet and related classes to common from HDFS.
(suresh)
HADOOP-9770. Make RetryCache#state non volatile. (suresh)
OPTIMIZATIONS
HADOOP-9150. Avoid unnecessary DNS resolution attempts for logical URIs

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

@ -52,7 +52,7 @@ public class RetryCache {
private static byte SUCCESS = 1;
private static byte FAILED = 2;
private volatile byte state = INPROGRESS;
private byte state = INPROGRESS;
// Store uuid as two long for better memory utilization
private final long clientIdMsb; // Most signficant bytes
@ -63,8 +63,10 @@ public class RetryCache {
private LightWeightGSet.LinkedElement next;
CacheEntry(byte[] clientId, int callId, long expirationTime) {
Preconditions.checkArgument(clientId.length == 16, "Invalid clientId");
// Conver UUID bytes to two longs
// ClientId must be a UUID - that is 16 octets.
Preconditions.checkArgument(clientId.length == 16,
"Invalid clientId - must be UUID of size 16 octets");
// Convert UUID bytes to two longs
long tmp = 0;
for (int i=0; i<8; i++) {
tmp = (tmp << 8) | (clientId[i] & 0xff);
@ -116,7 +118,7 @@ public class RetryCache {
this.notifyAll();
}
public boolean isSuccess() {
public synchronized boolean isSuccess() {
return state == SUCCESS;
}
@ -241,13 +243,13 @@ public class RetryCache {
private static CacheEntry newEntry(long expirationTime) {
return new CacheEntry(Server.getClientId(), Server.getCallId(),
expirationTime);
System.nanoTime() + expirationTime);
}
private static CacheEntryWithPayload newEntry(Object payload,
long expirationTime) {
return new CacheEntryWithPayload(Server.getClientId(), Server.getCallId(),
payload, expirationTime);
payload, System.nanoTime() + expirationTime);
}
/** Static method that provides null check for retryCache */