svn commit: r1148373 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java

[stack]

Author: stack
Date: Tue Jul 19 14:52:46 2011
New Revision: 1148373

URL: http://svn.apache.org/viewvc?rev=1148373&view=rev
Log:
HBASE-4101 Regionserver Deadlock

Modified:
    hbase/trunk/CHANGES.txt
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java

Modified: hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1148373&r1=1148372&r2=1148373&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Jul 19 14:52:46 2011
@@ -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

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java?rev=1148373&r1=1148372&r2=1148373&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java
 (original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java
 Tue Jul 19 14:52:46 2011
@@ -53,7 +53,7 @@ public class CompactionRequest implement
     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 implement
       this.totalSize = sz;
       this.isMajor = isMajor;
       this.p = p;
-      this.date = new Date();
+      this.timeInNanos = System.nanoTime();
     }
 
     /**
@@ -98,7 +98,7 @@ public class CompactionRequest implement
         return compareVal;
       }
 
-      compareVal = date.compareTo(request.date);
+      compareVal = timeInNanos.compareTo(request.timeInNanos);
       if (compareVal != 0) {
         return compareVal;
       }
@@ -164,7 +164,7 @@ public class CompactionRequest implement
         ", fileCount=" + files.size() +
         ", fileSize=" + StringUtils.humanReadableInt(totalSize) +
           ((fsList.isEmpty()) ? "" : " (" + fsList + ")") +
-        ", priority=" + p + ", date=" + date;
+        ", priority=" + p + ", time=" + timeInNanos;
     }
 
     @Override