svn commit: r1097689 - /hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java

[st...@apache.org]

Author: stack
Date: Fri Apr 29 05:38:39 2011
New Revision: 1097689

URL: http://svn.apache.org/viewvc?rev=1097689&view=rev
Log:
Fix broke jenkins build; Fix TestSplitLogWorker.  Remove added assert.  Value may have already been set by background thread so assert was checking input at wrong time

Modified:
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java?rev=1097689&r1=1097688&r2=1097689&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java Fri Apr 29 05:38:39 2011
@@ -67,7 +67,6 @@ public class TestSplitLogWorker {
 
   private boolean waitForCounterBoolean(AtomicLong ctr, long oldval, long newval,
       long timems) {
-    assert ctr.get() == oldval;
     long curt = System.currentTimeMillis();
     long endt = curt + timems;
     while (curt < endt) {
@@ -128,6 +127,7 @@ public class TestSplitLogWorker {
   @Test
   public void testAcquireTaskAtStartup() throws Exception {
     LOG.info("testAcquireTaskAtStartup");
+    ZKSplitLog.Counters.resetCounters();
 
     zkw.getZooKeeper().create(ZKSplitLog.getEncodedNodeName(zkw, "tatas"),
         TaskState.TASK_UNASSIGNED.get("mgr"), Ids.OPEN_ACL_UNSAFE,
@@ -159,6 +159,7 @@ public class TestSplitLogWorker {
   @Test
   public void testRaceForTask() throws Exception {
     LOG.info("testRaceForTask");
+    ZKSplitLog.Counters.resetCounters();
 
     zkw.getZooKeeper().create(ZKSplitLog.getEncodedNodeName(zkw, "trft"),
         TaskState.TASK_UNASSIGNED.get("manager"), Ids.OPEN_ACL_UNSAFE,
@@ -172,11 +173,10 @@ public class TestSplitLogWorker {
     slw2.start();
     try {
       waitForCounter(tot_wkr_task_acquired, 0, 1, 1000);
-      boolean first =
-        waitForCounterBoolean(tot_wkr_failed_to_grab_task_owned, 0, 1, 1000);
-      boolean second =
-        waitForCounterBoolean(tot_wkr_failed_to_grab_task_lost_race, 0, 1, 100);
-      assertTrue(first || second);
+      // Assert that either the tot_wkr_failed_to_grab_task_owned count was set of if
+      // not it, that we fell through to the next counter in line and it was set.
+      assertTrue(waitForCounterBoolean(tot_wkr_failed_to_grab_task_owned, 0, 1, 1000) ||
+        tot_wkr_failed_to_grab_task_lost_race.get() == 1);
       assertTrue(TaskState.TASK_OWNED.equals(ZKUtil.getData(zkw,
         ZKSplitLog.getEncodedNodeName(zkw, "trft")), "svr1") ||
         TaskState.TASK_OWNED.equals(ZKUtil.getData(zkw,
@@ -190,6 +190,7 @@ public class TestSplitLogWorker {
   @Test
   public void testPreemptTask() throws Exception {
     LOG.info("testPreemptTask");
+    ZKSplitLog.Counters.resetCounters();
 
     SplitLogWorker slw = new SplitLogWorker(zkw, TEST_UTIL.getConfiguration(),
         "tpt_svr", neverEndingTask);
@@ -219,6 +220,7 @@ public class TestSplitLogWorker {
   @Test
   public void testMultipleTasks() throws Exception {
     LOG.info("testMultipleTasks");
+    ZKSplitLog.Counters.resetCounters();
     SplitLogWorker slw = new SplitLogWorker(zkw, TEST_UTIL.getConfiguration(),
         "tmt_svr", neverEndingTask);
     slw.start();
@@ -255,6 +257,7 @@ public class TestSplitLogWorker {
   @Test
   public void testRescan() throws Exception {
     LOG.info("testRescan");
+    ZKSplitLog.Counters.resetCounters();
     slw = new SplitLogWorker(zkw, TEST_UTIL.getConfiguration(),
         "svr", neverEndingTask);
     slw.start();