HBASE-4101 Regionserver Deadlock

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1148373 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-07-19 14:52:46 +00:00
parent f2499505de
commit 820d40d134
2 changed files with 5 additions and 4 deletions

View File

@ -420,6 +420,7 @@ Release 0.90.4 - Unreleased
HBASE-4088 npes in server shutdown
HBASE-3872 Hole in split transaction rollback; edits to .META. need
to be rolled back even if it seems like they didn't make it
HBASE-4101 Regionserver Deadlock (ramkrishna.s.vasudevan)
IMPROVEMENT
HBASE-3882 hbase-config.sh needs to be updated so it can auto-detects the

View File

@ -53,7 +53,7 @@ public class CompactionRequest implements Comparable<CompactionRequest>,
private final long totalSize;
private final boolean isMajor;
private int p;
private final Date date;
private final Long timeInNanos;
private HRegionServer server = null;
public CompactionRequest(HRegion r, Store s,
@ -71,7 +71,7 @@ public class CompactionRequest implements Comparable<CompactionRequest>,
this.totalSize = sz;
this.isMajor = isMajor;
this.p = p;
this.date = new Date();
this.timeInNanos = System.nanoTime();
}
/**
@ -98,7 +98,7 @@ public class CompactionRequest implements Comparable<CompactionRequest>,
return compareVal;
}
compareVal = date.compareTo(request.date);
compareVal = timeInNanos.compareTo(request.timeInNanos);
if (compareVal != 0) {
return compareVal;
}
@ -164,7 +164,7 @@ public class CompactionRequest implements Comparable<CompactionRequest>,
", fileCount=" + files.size() +
", fileSize=" + StringUtils.humanReadableInt(totalSize) +
((fsList.isEmpty()) ? "" : " (" + fsList + ")") +
", priority=" + p + ", date=" + date;
", priority=" + p + ", time=" + timeInNanos;
}
@Override