Fix the build; Add a noop to TestRegionServerQueue and flip boolean test in TestMasterTransitions
git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@940039 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
9ad652e9ba
commit
27a7acafde
|
@ -90,7 +90,7 @@ public class TestMasterTransistions {
|
|||
private final int otherServerIndex;
|
||||
private final HRegionInfo hri;
|
||||
private int closeCount = 0;
|
||||
static final int SERVER_DURATION = 10 * 1000;
|
||||
static final int SERVER_DURATION = 3 * 1000;
|
||||
static final int CLOSE_DURATION = 1 * 1000;
|
||||
|
||||
HBase2428Listener(final MiniHBaseCluster c, final HServerAddress metaAddress,
|
||||
|
@ -136,7 +136,7 @@ public class TestMasterTransistions {
|
|||
}
|
||||
|
||||
public void processed(final RegionServerOperation op) {
|
||||
if (isWantedCloseOperation(op) == null) return;
|
||||
if (isWantedCloseOperation(op) != null) return;
|
||||
this.done = true;
|
||||
}
|
||||
|
||||
|
@ -207,6 +207,7 @@ public class TestMasterTransistions {
|
|||
// We should not have retried the close more times than it took for the
|
||||
// server shutdown message to exit the delay queue and get processed
|
||||
// (Multiple by two to add in some slop in case of GC or something).
|
||||
assertTrue(listener.getCloseCount() > 1);
|
||||
assertTrue(listener.getCloseCount() <
|
||||
((HBase2428Listener.SERVER_DURATION/HBase2428Listener.CLOSE_DURATION) * 2));
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
|
|||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
* Test the queue used to manage RegionServerOperations.
|
||||
|
@ -44,4 +45,8 @@ public class TestRegionServerOperationQueue {
|
|||
@After
|
||||
public void tearDown() throws Exception {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNothing() throws Exception {
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue