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 2015/08/26 01:16:14 UTC
hbase git commit: HBASE-14290 Spin up less threads in tests
Repository: hbase
Updated Branches:
refs/heads/master 44caba31e -> 3dacee674
HBASE-14290 Spin up less threads in tests
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3dacee67
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3dacee67
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3dacee67
Branch: refs/heads/master
Commit: 3dacee674c87564aad9c5b18b229ab904c21ff2a
Parents: 44caba3
Author: stack <st...@apache.org>
Authored: Tue Aug 25 16:16:03 2015 -0700
Committer: stack <st...@apache.org>
Committed: Tue Aug 25 16:16:03 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/ipc/AsyncCall.java | 5 +++--
.../org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java | 4 ++--
.../java/org/apache/hadoop/hbase/ipc/RpcServer.java | 2 +-
.../hbase/client/TestCloneSnapshotFromClient.java | 1 -
.../hbase/master/TestDistributedLogSplitting.java | 12 ++++++------
.../apache/hadoop/hbase/master/TestRollingRestart.java | 3 +--
.../hbase/regionserver/TestRegionReplicaFailover.java | 1 -
.../hadoop/hbase/snapshot/TestExportSnapshot.java | 1 -
hbase-server/src/test/resources/hbase-site.xml | 8 ++++++++
9 files changed, 21 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3dacee67/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncCall.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncCall.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncCall.java
index ec1909a..431c669 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncCall.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncCall.java
@@ -86,8 +86,9 @@ public class AsyncCall extends DefaultPromise<Message> {
@Override
public String toString() {
- return "callId: " + this.id + " methodName: " + this.method.getName() + " param {"
- + (this.param != null ? ProtobufUtil.getShortTextFormat(this.param) : "") + "}";
+ return "callId=" + this.id + ", method=" + this.method.getName() +
+ ", rpcTimeout=" + this.rpcTimeout + ", param {" +
+ (this.param != null ? ProtobufUtil.getShortTextFormat(this.param) : "") + "}";
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/3dacee67/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
index cfc8b1b..dbc39cf 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
@@ -146,10 +146,10 @@ public class AsyncRpcChannel {
this.channel = connect(bootstrap).channel();
- name = ("IPC Client (" + channel.hashCode() + ") connection to " +
+ name = ("IPC Client (" + channel.hashCode() + ") to " +
address.toString() +
((ticket == null) ?
- " from an unknown user" :
+ " from unknown user" :
(" from " + ticket.getName())));
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/3dacee67/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
index 1f14ad7..8cead2a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
@@ -611,7 +611,7 @@ public class RpcServer implements RpcServerInterface {
readers[i] = reader;
readPool.execute(reader);
}
- LOG.info(getName() + ": started " + readThreads + " reader(s).");
+ LOG.info(getName() + ": started " + readThreads + " reader(s) listening on port=" + port);
// Register accepts on the server socket with the selector.
acceptChannel.register(selector, SelectionKey.OP_ACCEPT);
http://git-wip-us.apache.org/repos/asf/hbase/blob/3dacee67/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java
index f0ff764..0091204 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java
@@ -69,7 +69,6 @@ public class TestCloneSnapshotFromClient {
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6);
TEST_UTIL.getConfiguration().setBoolean(
"hbase.master.enabletable.roundrobin", true);
- TEST_UTIL.getConfiguration().setInt(HConstants.REGION_SERVER_HIGH_PRIORITY_HANDLER_COUNT, 40);
TEST_UTIL.startMiniCluster(3);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/3dacee67/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
index 423b954..58ffb86 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
@@ -1,5 +1,6 @@
/**
*
+
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -131,9 +132,9 @@ public class TestDistributedLogSplitting {
}
- // Start a cluster with 2 masters and 6 regionservers
+ // Start a cluster with 2 masters and 5 regionservers
static final int NUM_MASTERS = 2;
- static final int NUM_RS = 6;
+ static final int NUM_RS = 5;
MiniHBaseCluster cluster;
HMaster master;
@@ -167,7 +168,6 @@ public class TestDistributedLogSplitting {
conf.setInt(HConstants.REGIONSERVER_INFO_PORT, -1);
conf.setFloat(HConstants.LOAD_BALANCER_SLOP_KEY, (float) 100.0); // no load balancing
conf.setInt("hbase.regionserver.wal.max.splitters", 3);
- conf.setInt(HConstants.REGION_SERVER_HIGH_PRIORITY_HANDLER_COUNT, 40);
TEST_UTIL.shutdownMiniHBaseCluster();
TEST_UTIL = new HBaseTestingUtility(conf);
TEST_UTIL.setDFSCluster(dfsCluster);
@@ -1466,8 +1466,8 @@ public class TestDistributedLogSplitting {
if (ht != null) ht.close();
if (zkw != null) zkw.close();
}
- }
-
+ }
+
Table installTable(ZooKeeperWatcher zkw, String tname, String fname, int nrs) throws Exception {
return installTable(zkw, tname, fname, nrs, 0);
}
@@ -1794,4 +1794,4 @@ public class TestDistributedLogSplitting {
return hrs;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/hbase/blob/3dacee67/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java
index 3d12c12..724d9a0 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java
@@ -68,7 +68,6 @@ public class TestRollingRestart {
// Start the cluster
log("Starting cluster");
Configuration conf = HBaseConfiguration.create();
- conf.setInt(HConstants.REGION_SERVER_HIGH_PRIORITY_HANDLER_COUNT, 40);
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(conf);
TEST_UTIL.startMiniCluster(NUM_MASTERS, NUM_RS);
MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
@@ -226,7 +225,7 @@ public class TestRollingRestart {
}
return numFound;
}
-
+
private void assertRegionsAssigned(MiniHBaseCluster cluster,
Set<String> expectedRegions) throws IOException {
int numFound = getNumberOfOnlineRegions(cluster);
http://git-wip-us.apache.org/repos/asf/hbase/blob/3dacee67/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java
index 9b954c2..b18a0f4 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java
@@ -111,7 +111,6 @@ public class TestRegionReplicaFailover {
conf.setInt("replication.stats.thread.period.seconds", 5);
conf.setBoolean("hbase.tests.use.shortcircuit.reads", false);
conf.setBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY, distributedLogReplay);
- conf.setInt(HConstants.REGION_SERVER_HIGH_PRIORITY_HANDLER_COUNT, 60);
HTU.startMiniCluster(NB_SERVERS);
htd = HTU.createTableDescriptor(
http://git-wip-us.apache.org/repos/asf/hbase/blob/3dacee67/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java
index 1e16f8f..71a39f0 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java
@@ -83,7 +83,6 @@ public class TestExportSnapshot {
conf.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6);
conf.setBoolean("hbase.master.enabletable.roundrobin", true);
conf.setInt("mapreduce.map.maxattempts", 10);
- conf.setInt(HConstants.REGION_SERVER_HIGH_PRIORITY_HANDLER_COUNT, 40);
}
@BeforeClass
http://git-wip-us.apache.org/repos/asf/hbase/blob/3dacee67/hbase-server/src/test/resources/hbase-site.xml
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/resources/hbase-site.xml b/hbase-server/src/test/resources/hbase-site.xml
index 34a1b20..2d06c0a 100644
--- a/hbase-server/src/test/resources/hbase-site.xml
+++ b/hbase-server/src/test/resources/hbase-site.xml
@@ -51,6 +51,14 @@
<value>5</value>
</property>
<property>
+ <name>hbase.regionserver.metahandler.count</name>
+ <value>5</value>
+ </property>
+ <property>
+ <name>hbase.ipc.server.read.threadpool.size</name>
+ <value>3</value>
+ </property>
+ <property>
<name>hbase.master.info.port</name>
<value>-1</value>
<description>The port for the hbase master web UI