HBASE-14290 Spin up less threads in tests

Conflicts:
	hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
This commit is contained in:
stack 2015-08-25 16:16:03 -07:00
parent a72d406941
commit c127577862
9 changed files with 780 additions and 709 deletions

View File

@ -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) : "") + "}";
}
/**

View File

@ -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())));
}

View File

@ -595,7 +595,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);

View File

@ -70,7 +70,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);
}

View File

@ -69,7 +69,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();
@ -237,7 +236,7 @@ public class TestRollingRestart {
}
return numFound;
}
private void assertRegionsAssigned(MiniHBaseCluster cluster,
Set<String> expectedRegions) throws IOException {
int numFound = getNumberOfOnlineRegions(cluster);

View File

@ -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(

View File

@ -81,7 +81,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

View File

@ -50,6 +50,14 @@
<name>hbase.regionserver.handler.count</name>
<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>