You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2017/09/15 17:42:18 UTC
[1/4] hbase git commit: Amend HBASE-18813 TestCanaryTool fails on
branch-1 / branch-1.4
Repository: hbase
Updated Branches:
refs/heads/branch-1 862a717e3 -> e5f80f36e
refs/heads/branch-1.4 55aa7bbc2 -> f54c06f49
Amend HBASE-18813 TestCanaryTool fails on branch-1 / branch-1.4
Disable units where argument matching is intermittently failing
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e5f80f36
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e5f80f36
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e5f80f36
Branch: refs/heads/branch-1
Commit: e5f80f36e2f32c44422d7d84482d77759075088a
Parents: 469d6bf
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Sep 15 10:24:05 2017 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Sep 15 10:42:04 2017 -0700
----------------------------------------------------------------------
.../test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e5f80f36/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
index f186281..0204582 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
@@ -37,6 +37,7 @@ import org.apache.log4j.spi.LoggingEvent;
import com.google.common.collect.Iterables;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -119,6 +120,7 @@ public class TestCanaryTool {
}
@Test
+ @Ignore("Intermittent argument matching failures, see HBASE-18813")
public void testReadTableTimeouts() throws Exception {
final TableName [] tableNames = new TableName[2];
tableNames[0] = TableName.valueOf("testReadTableTimeouts1");
@@ -162,6 +164,7 @@ public class TestCanaryTool {
}
@Test
+ @Ignore("Intermittent argument matching failures, see HBASE-18813")
public void testWriteTableTimeout() throws Exception {
ExecutorService executor = new ScheduledThreadPoolExecutor(1);
Canary.RegionStdOutSink sink = spy(new Canary.RegionStdOutSink());
[2/4] hbase git commit: Revert "Amend HBASE-18813 TestCanaryTool
fails on branch-1 / branch-1.4"
Posted by ap...@apache.org.
Revert "Amend HBASE-18813 TestCanaryTool fails on branch-1 / branch-1.4"
This reverts commit aa7c93c6597f378fe4bed1ec7f9094ac9f4aa356.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/469d6bf4
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/469d6bf4
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/469d6bf4
Branch: refs/heads/branch-1
Commit: 469d6bf457c2c4d8ebe10c1e39004a6b9d907112
Parents: 862a717
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Sep 15 10:19:22 2017 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Sep 15 10:42:04 2017 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/tool/TestCanaryTool.java | 13 -------------
1 file changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/469d6bf4/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
index 3e714b0..f186281 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
@@ -120,7 +120,6 @@ public class TestCanaryTool {
@Test
public void testReadTableTimeouts() throws Exception {
- if (skipOldJREs()) return;
final TableName [] tableNames = new TableName[2];
tableNames[0] = TableName.valueOf("testReadTableTimeouts1");
tableNames[1] = TableName.valueOf("testReadTableTimeouts2");
@@ -164,7 +163,6 @@ public class TestCanaryTool {
@Test
public void testWriteTableTimeout() throws Exception {
- if (skipOldJREs()) return;
ExecutorService executor = new ScheduledThreadPoolExecutor(1);
Canary.RegionStdOutSink sink = spy(new Canary.RegionStdOutSink());
Canary canary = new Canary(executor, sink);
@@ -183,7 +181,6 @@ public class TestCanaryTool {
//no table created, so there should be no regions
@Test
public void testRegionserverNoRegions() throws Exception {
- if (skipOldJREs()) return;
runRegionserverCanary();
verify(mockAppender).doAppend(argThat(new ArgumentMatcher<LoggingEvent>() {
@Override
@@ -196,7 +193,6 @@ public class TestCanaryTool {
//by creating a table, there shouldn't be any region servers not serving any regions
@Test
public void testRegionserverWithRegions() throws Exception {
- if (skipOldJREs()) return;
TableName tableName = TableName.valueOf("testTable");
testingUtility.createTable(tableName, new byte[][] { FAMILY });
runRegionserverCanary();
@@ -231,15 +227,6 @@ public class TestCanaryTool {
assertEquals("verify no read error count", 0, canary.getReadFailures().size());
}
- // We have unexpected trouble asserting with custom matchers using Mockito on Java < 8,
- // so skip the relevant tests if running on an older JRE.
- private static boolean skipOldJREs() {
- String specVersion[] = System.getProperty("java.specification.version").split("\\.");
- int majorVersion = Integer.valueOf(specVersion[0]);
- int minorVersion = Integer.valueOf(specVersion[1]);
- return !(majorVersion > 1 || (majorVersion == 1 && minorVersion > 7));
- }
-
private void runRegionserverCanary() throws Exception {
ExecutorService executor = new ScheduledThreadPoolExecutor(1);
Canary canary = new Canary(executor, new Canary.RegionServerStdOutSink());
[3/4] hbase git commit: Revert "Amend HBASE-18813 TestCanaryTool
fails on branch-1 / branch-1.4"
Posted by ap...@apache.org.
Revert "Amend HBASE-18813 TestCanaryTool fails on branch-1 / branch-1.4"
This reverts commit ae5da908bd8eb6cb6db6517dbdbe46aff6b9d933.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/31b90960
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/31b90960
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/31b90960
Branch: refs/heads/branch-1.4
Commit: 31b9096034e19171989fd5b76313e7e0f1a9a12a
Parents: 55aa7bb
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Sep 15 10:19:12 2017 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Sep 15 10:42:09 2017 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/tool/TestCanaryTool.java | 13 -------------
1 file changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/31b90960/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
index 3e714b0..f186281 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
@@ -120,7 +120,6 @@ public class TestCanaryTool {
@Test
public void testReadTableTimeouts() throws Exception {
- if (skipOldJREs()) return;
final TableName [] tableNames = new TableName[2];
tableNames[0] = TableName.valueOf("testReadTableTimeouts1");
tableNames[1] = TableName.valueOf("testReadTableTimeouts2");
@@ -164,7 +163,6 @@ public class TestCanaryTool {
@Test
public void testWriteTableTimeout() throws Exception {
- if (skipOldJREs()) return;
ExecutorService executor = new ScheduledThreadPoolExecutor(1);
Canary.RegionStdOutSink sink = spy(new Canary.RegionStdOutSink());
Canary canary = new Canary(executor, sink);
@@ -183,7 +181,6 @@ public class TestCanaryTool {
//no table created, so there should be no regions
@Test
public void testRegionserverNoRegions() throws Exception {
- if (skipOldJREs()) return;
runRegionserverCanary();
verify(mockAppender).doAppend(argThat(new ArgumentMatcher<LoggingEvent>() {
@Override
@@ -196,7 +193,6 @@ public class TestCanaryTool {
//by creating a table, there shouldn't be any region servers not serving any regions
@Test
public void testRegionserverWithRegions() throws Exception {
- if (skipOldJREs()) return;
TableName tableName = TableName.valueOf("testTable");
testingUtility.createTable(tableName, new byte[][] { FAMILY });
runRegionserverCanary();
@@ -231,15 +227,6 @@ public class TestCanaryTool {
assertEquals("verify no read error count", 0, canary.getReadFailures().size());
}
- // We have unexpected trouble asserting with custom matchers using Mockito on Java < 8,
- // so skip the relevant tests if running on an older JRE.
- private static boolean skipOldJREs() {
- String specVersion[] = System.getProperty("java.specification.version").split("\\.");
- int majorVersion = Integer.valueOf(specVersion[0]);
- int minorVersion = Integer.valueOf(specVersion[1]);
- return !(majorVersion > 1 || (majorVersion == 1 && minorVersion > 7));
- }
-
private void runRegionserverCanary() throws Exception {
ExecutorService executor = new ScheduledThreadPoolExecutor(1);
Canary canary = new Canary(executor, new Canary.RegionServerStdOutSink());
[4/4] hbase git commit: Amend HBASE-18813 TestCanaryTool fails on
branch-1 / branch-1.4
Posted by ap...@apache.org.
Amend HBASE-18813 TestCanaryTool fails on branch-1 / branch-1.4
Disable units where argument matching is intermittently failing
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f54c06f4
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f54c06f4
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f54c06f4
Branch: refs/heads/branch-1.4
Commit: f54c06f492c791882e65e10f7c6f9f995027357e
Parents: 31b9096
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Sep 15 10:24:05 2017 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Sep 15 10:42:09 2017 -0700
----------------------------------------------------------------------
.../test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f54c06f4/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
index f186281..0204582 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
@@ -37,6 +37,7 @@ import org.apache.log4j.spi.LoggingEvent;
import com.google.common.collect.Iterables;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -119,6 +120,7 @@ public class TestCanaryTool {
}
@Test
+ @Ignore("Intermittent argument matching failures, see HBASE-18813")
public void testReadTableTimeouts() throws Exception {
final TableName [] tableNames = new TableName[2];
tableNames[0] = TableName.valueOf("testReadTableTimeouts1");
@@ -162,6 +164,7 @@ public class TestCanaryTool {
}
@Test
+ @Ignore("Intermittent argument matching failures, see HBASE-18813")
public void testWriteTableTimeout() throws Exception {
ExecutorService executor = new ScheduledThreadPoolExecutor(1);
Canary.RegionStdOutSink sink = spy(new Canary.RegionStdOutSink());