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 0cb002f..593f535 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 @@ -512,7 +512,7 @@ public class RpcServer implements RpcServerInterface { public Listener(final String name) throws IOException { super(name); - backlogLength = conf.getInt("ipc.server.listen.queue.size", 128); + backlogLength = conf.getInt("hbase.ipc.server.listen.queue.size", 128); // Create a new server socket and set to non blocking mode acceptChannel = ServerSocketChannel.open(); acceptChannel.configureBlocking(false); @@ -1700,7 +1700,7 @@ public class RpcServer implements RpcServerInterface { responder, totalRequestSize, null); ByteArrayOutputStream responseBuffer = new ByteArrayOutputStream(); setupResponse(responseBuffer, callTooBig, new CallQueueTooBigException(), - "Call queue is full, is ipc.server.max.callqueue.size too small?"); + "Call queue is full, is hbase.ipc.server.max.callqueue.size too small?"); responder.doRespond(callTooBig); return; } @@ -1864,12 +1864,12 @@ public class RpcServer implements RpcServerInterface { this.conf = conf; this.socketSendBufferSize = 0; this.maxQueueSize = - this.conf.getInt("ipc.server.max.callqueue.size", DEFAULT_MAX_CALLQUEUE_SIZE); - this.readThreads = conf.getInt("ipc.server.read.threadpool.size", 10); - this.maxIdleTime = 2 * conf.getInt("ipc.client.connection.maxidletime", 1000); - this.maxConnectionsToNuke = conf.getInt("ipc.client.kill.max", 10); - this.thresholdIdleConnections = conf.getInt("ipc.client.idlethreshold", 4000); - this.purgeTimeout = conf.getLong("ipc.client.call.purge.timeout", + this.conf.getInt("hbase.ipc.server.max.callqueue.size", DEFAULT_MAX_CALLQUEUE_SIZE); + this.readThreads = conf.getInt("hbase.ipc.server.read.threadpool.size", 10); + this.maxIdleTime = 2 * conf.getInt("hbase.ipc.client.connection.maxidletime", 1000); + this.maxConnectionsToNuke = conf.getInt("hbase.ipc.client.kill.max", 10); + this.thresholdIdleConnections = conf.getInt("hbase.ipc.client.idlethreshold", 4000); + this.purgeTimeout = conf.getLong("hbase.ipc.client.call.purge.timeout", 2 * HConstants.DEFAULT_HBASE_RPC_TIMEOUT); this.warnResponseTime = conf.getInt(WARN_RESPONSE_TIME, DEFAULT_WARN_RESPONSE_TIME); this.warnResponseSize = conf.getInt(WARN_RESPONSE_SIZE, DEFAULT_WARN_RESPONSE_SIZE); @@ -1879,8 +1879,8 @@ public class RpcServer implements RpcServerInterface { this.port = listener.getAddress().getPort(); this.metrics = new MetricsHBaseServer(name, new MetricsHBaseServerWrapperImpl(this)); - this.tcpNoDelay = conf.getBoolean("ipc.server.tcpnodelay", true); - this.tcpKeepAlive = conf.getBoolean("ipc.server.tcpkeepalive", true); + this.tcpNoDelay = conf.getBoolean("hbase.ipc.server.tcpnodelay", true); + this.tcpKeepAlive = conf.getBoolean("hbase.ipc.server.tcpkeepalive", true); this.warnDelayedCalls = conf.getInt(WARN_DELAYED_CALLS, DEFAULT_WARN_DELAYED_CALLS); this.delayedCalls = new AtomicInteger(0); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 6bce6a8..d63fd93 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -610,7 +610,7 @@ public class HRegion implements HeapSize { // , Writable{ + busyWaitDuration + ") or hbase.busy.wait.multiplier.max (" + maxBusyWaitMultiplier + "). Their product should be positive"); } - this.maxBusyWaitDuration = conf.getLong("ipc.client.call.purge.timeout", + this.maxBusyWaitDuration = conf.getLong("hbase.ipc.client.call.purge.timeout", 2 * HConstants.DEFAULT_HBASE_RPC_TIMEOUT); /* diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java index 1a0d5d1..89b1ccb 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java @@ -139,7 +139,7 @@ public class TestHLog { TEST_UTIL.getConfiguration().setInt( "dfs.client.block.recovery.retries", 1); TEST_UTIL.getConfiguration().setInt( - "ipc.client.connection.maxidletime", 500); + "hbase.ipc.client.connection.maxidletime", 500); TEST_UTIL.getConfiguration().set(CoprocessorHost.WAL_COPROCESSOR_CONF_KEY, SampleRegionWALObserver.class.getName()); TEST_UTIL.startMiniDFSCluster(3);