From 820d40d1340d348f419575e3877dfe2069a2eee3 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Tue, 19 Jul 2011 14:52:46 +0000
Subject: [PATCH] HBASE-4101 Regionserver Deadlock

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1148373 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                               | 1 +
 .../hbase/regionserver/compactions/CompactionRequest.java | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 15d838d7732..a4ae7faba89 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -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
diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java b/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java
index a507f12dd98..6c8a185f81a 100644
--- a/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java
+++ b/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java
@@ -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