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 2018/02/20 14:24:30 UTC
hbase git commit: HBASE-20021 TestFromClientSideWithCoprocessor is
flakey
Repository: hbase
Updated Branches:
refs/heads/branch-2 34d3e847c -> 0152d5e2a
HBASE-20021 TestFromClientSideWithCoprocessor is flakey
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0152d5e2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0152d5e2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0152d5e2
Branch: refs/heads/branch-2
Commit: 0152d5e2aec4dd81afbbeefde00f1941c3579649
Parents: 34d3e84
Author: zhangduo <zh...@apache.org>
Authored: Tue Feb 20 20:07:27 2018 +0800
Committer: Michael Stack <st...@apache.org>
Committed: Tue Feb 20 06:24:22 2018 -0800
----------------------------------------------------------------------
.../hadoop/hbase/client/TestFromClientSide.java | 17 ++++++++++-------
.../client/TestFromClientSideWithCoprocessor.java | 17 +++++------------
2 files changed, 15 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/0152d5e2/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
index b028880..29d3439 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
@@ -139,24 +139,27 @@ public class TestFromClientSide {
@Rule
public TestName name = new TestName();
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
+ protected static final void initialize(Class<?>... cps) throws Exception {
// Uncomment the following lines if more verbosity is needed for
// debugging (see HBASE-12285 for details).
- //((Log4JLogger)RpcServer.LOG).getLogger().setLevel(Level.ALL);
- //((Log4JLogger)RpcClient.LOG).getLogger().setLevel(Level.ALL);
- //((Log4JLogger)ScannerCallable.LOG).getLogger().setLevel(Level.ALL);
+ // ((Log4JLogger)RpcServer.LOG).getLogger().setLevel(Level.ALL);
+ // ((Log4JLogger)RpcClient.LOG).getLogger().setLevel(Level.ALL);
+ // ((Log4JLogger)ScannerCallable.LOG).getLogger().setLevel(Level.ALL);
// make sure that we do not get the same ts twice, see HBASE-19731 for more details.
EnvironmentEdgeManager.injectEdge(new NonRepeatedEnvironmentEdge());
Configuration conf = TEST_UTIL.getConfiguration();
conf.setStrings(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY,
- MultiRowMutationEndpoint.class.getName());
+ Arrays.stream(cps).map(Class::getName).toArray(String[]::new));
conf.setBoolean("hbase.table.sanity.checks", true); // enable for below tests
- conf.setLong(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, 6000000);
// We need more than one region server in this test
TEST_UTIL.startMiniCluster(SLAVES);
}
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+ initialize(MultiRowMutationEndpoint.class);
+ }
+
@AfterClass
public static void tearDownAfterClass() throws Exception {
TEST_UTIL.shutdownMiniCluster();
http://git-wip-us.apache.org/repos/asf/hbase/blob/0152d5e2/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideWithCoprocessor.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideWithCoprocessor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideWithCoprocessor.java
index 5bf70c4..37d0135 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideWithCoprocessor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideWithCoprocessor.java
@@ -17,9 +17,7 @@
*/
package org.apache.hadoop.hbase.client;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
import org.apache.hadoop.hbase.coprocessor.MultiRowMutationEndpoint;
import org.apache.hadoop.hbase.regionserver.NoOpScanPolicyObserver;
import org.apache.hadoop.hbase.testclassification.ClientTests;
@@ -29,23 +27,18 @@ import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
/**
- * Test all client operations with a coprocessor that
- * just implements the default flush/compact/scan policy.
+ * Test all client operations with a coprocessor that just implements the default flush/compact/scan
+ * policy.
*/
-@Category({LargeTests.class, ClientTests.class})
+@Category({ LargeTests.class, ClientTests.class })
public class TestFromClientSideWithCoprocessor extends TestFromClientSide {
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestFromClientSideWithCoprocessor.class);
+ HBaseClassTestRule.forClass(TestFromClientSideWithCoprocessor.class);
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- Configuration conf = TEST_UTIL.getConfiguration();
- conf.setStrings(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY,
- MultiRowMutationEndpoint.class.getName(), NoOpScanPolicyObserver.class.getName());
- conf.setBoolean("hbase.table.sanity.checks", true); // enable for below tests
- // We need more than one region server in this test
- TEST_UTIL.startMiniCluster(SLAVES);
+ initialize(MultiRowMutationEndpoint.class, NoOpScanPolicyObserver.class);
}
}