hbase git commit: HBASE-14368 New TestWALLockup broken by addendum added to parent issue

[st...@apache.org]

Repository: hbase
Updated Branches:
  refs/heads/master a11f5c55b -> bada19bb5


HBASE-14368 New TestWALLockup broken by addendum added to parent issue


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bada19bb
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bada19bb
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bada19bb

Branch: refs/heads/master
Commit: bada19bb54a358233db2b3e23c86d215ac2dc29b
Parents: a11f5c5
Author: stack <st...@apache.org>
Authored: Sat Sep 5 08:53:22 2015 -0700
Committer: stack <st...@apache.org>
Committed: Sat Sep 5 08:53:22 2015 -0700

----------------------------------------------------------------------
 .../hadoop/hbase/regionserver/TestWALLockup.java    | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/bada19bb/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java
index 47e5213..a620951 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java
@@ -55,7 +55,6 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.rules.TestName;
 import org.mockito.Mockito;
-import org.mockito.exceptions.verification.WantedButNotInvoked;
 
 /**
  * Testing for lock up of WAL subsystem.
@@ -226,26 +225,13 @@ public class TestWALLockup {
       // This append provokes a WAL roll.
       dodgyWAL.append(htd, region.getRegionInfo(), key, edit, region.getSequenceId(), true, cells);
       boolean exception = false;
-      Mockito.verify(server, Mockito.atLeast(0)).
-        abort(Mockito.anyString(), (Throwable)Mockito.anyObject());
       try {
         dodgyWAL.sync();
       } catch (Exception e) {
         exception = true;
       }
       assertTrue("Did not get sync exception", exception);
-      // An append in the WAL but the sync failed is a server abort condition. That is our
-      // current semantic. Verify. It takes a while for abort to be called. Just hang here till it
-      // happens. If it don't we'll timeout the whole test. That is fine.
-      while (true) {
-        try {
-          Mockito.verify(server, Mockito.atLeast(1)).
-            abort(Mockito.anyString(), (Throwable)Mockito.anyObject());
-          break;
-        } catch (WantedButNotInvoked t) {
-          Threads.sleep(1);
-        }
-      }
+
       // Get a memstore flush going too so we have same hung profile as up in the issue over
       // in HBASE-14317. Flush hangs trying to get sequenceid because the ringbuffer is held up
       // by the zigzaglatch waiting on syncs to come home.