You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2013/05/02 23:13:45 UTC
svn commit: r1478556 - in /hbase/trunk:
hbase-client/src/main/java/org/apache/hadoop/hbase/Chore.java
hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
Author: stack
Date: Thu May 2 21:13:31 2013
New Revision: 1478556
URL: http://svn.apache.org/r1478556
Log:
HBASE-8482 TestHBaseFsck#testCheckTableLocks broke; java.lang.AssertionError: expected:<[]> but was:<[EXPIRED_TABLE_LOCK]>
Modified:
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/Chore.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/Chore.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/Chore.java?rev=1478556&r1=1478555&r2=1478556&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/Chore.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/Chore.java Thu May 2 21:13:31 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/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java?rev=1478556&r1=1478555&r2=1478556&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java Thu May 2 21:13:31 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);