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

HDFS-4029. GenerationStamp should use an AtomicLong. Contributed by Eli Collins 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1399096 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-10-17 04:58:24 +00:00
parent 24015b7684
commit a258263ecf
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -394,6 +394,8 @@ Release 2.0.3-alpha - Unreleased
HDFS-2946. HA: Put a cap on the number of completed edits files retained
by the NN. (atm)
HDFS-4029. GenerationStamp should use an AtomicLong. (eli)
OPTIMIZATIONS
BUG FIXES

24
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/GenerationStamp.java
View File

@ -17,6 +17,8 @@
*/
package org.apache.hadoop.hdfs.server.common;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.hadoop.classification.InterfaceAudience;
/****************************************************************
@ -35,7 +37,7 @@ public class GenerationStamp implements Comparable<GenerationStamp> {
*/
public static final long GRANDFATHER_GENERATION_STAMP = 0;
private volatile long genstamp;
private AtomicLong genstamp = new AtomicLong();
/**
* Create a new instance, initialized to FIRST_VALID_STAMP.
@ -48,35 +50,36 @@ public class GenerationStamp implements Comparable<GenerationStamp> {
* Create a new instance, initialized to the specified value.
*/
GenerationStamp(long stamp) {
this.genstamp = stamp;
genstamp.set(stamp);
}
/**
* Returns the current generation stamp
*/
public long getStamp() {
return this.genstamp;
return genstamp.get();
}
/**
* Sets the current generation stamp
*/
public void setStamp(long stamp) {
this.genstamp = stamp;
genstamp.set(stamp);
}
/**
* First increments the counter and then returns the stamp
*/
public synchronized long nextStamp() {
this.genstamp++;
return this.genstamp;
public long nextStamp() {
return genstamp.incrementAndGet();
}
@Override // Comparable
public int compareTo(GenerationStamp that) {
return this.genstamp < that.genstamp ? -1 :
this.genstamp > that.genstamp ? 1 : 0;
long stamp1 = this.genstamp.get();
long stamp2 = that.genstamp.get();
return stamp1 < stamp2 ? -1 :
stamp1 > stamp2 ? 1 : 0;
}
@Override // Object
@ -89,6 +92,7 @@ public class GenerationStamp implements Comparable<GenerationStamp> {
@Override // Object
public int hashCode() {
return (int) (genstamp^(genstamp>>>32));
long stamp = genstamp.get();
return (int) (stamp^(stamp>>>32));
}
}