hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1478557 - in /hbase/branches/0.95: hbase-client/src/main/java/org/apache/hadoop/hbase/Chore.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
Date Thu, 02 May 2013 21:15:00 GMT
Author: stack
Date: Thu May  2 21:14:44 2013
New Revision: 1478557

URL: http://svn.apache.org/r1478557
Log:
HBASE-8482 TestHBaseFsck#testCheckTableLocks broke; java.lang.AssertionError: expected:<[]>
but was:<[EXPIRED_TABLE_LOCK]>

Modified:
    hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/Chore.java
    hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java

Modified: hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/Chore.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/Chore.java?rev=1478557&r1=1478556&r2=1478557&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/Chore.java (original)
+++ hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/Chore.java Thu
May  2 21:14:44 2013
@@ -21,7 +21,6 @@ package org.apache.hadoop.hbase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
 import org.apache.hadoop.hbase.util.HasThread;
 import org.apache.hadoop.hbase.util.Sleeper;
 
@@ -73,7 +72,7 @@ public abstract class Chore extends HasT
     try {
       boolean initialChoreComplete = false;
       while (!this.stopper.isStopped()) {
-        long startTime = EnvironmentEdgeManager.currentTimeMillis();
+        long startTime = System.currentTimeMillis();
         try {
           if (!initialChoreComplete) {
             initialChoreComplete = initialChore();

Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java?rev=1478557&r1=1478556&r2=1478557&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
(original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
Thu May  2 21:14:44 2013
@@ -1939,7 +1939,7 @@ public class TestHBaseFsck {
     }
   }
 
-  @Test(timeout=30000)
+  @Test(timeout=60000)
   public void testCheckTableLocks() throws Exception {
     IncrementingEnvironmentEdge edge = new IncrementingEnvironmentEdge(0);
     EnvironmentEdgeManager.injectEdge(edge);



Mime
View raw message