Repository: hbase Updated Branches: refs/heads/0.98 ed61064ba -> ee5c109bb
HBASE-11492 Hadoop configuration overrides some ipc parameters including tcpNoDelay - addendum Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ee5c109b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ee5c109b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ee5c109b Branch: refs/heads/0.98 Commit: ee5c109bbcb46bff4a8e7cecfbf4bdc36477485e Parents: ed61064 Author: Nicolas Liochon <[email protected]> Authored: Tue Jul 22 15:03:23 2014 +0200 Committer: Nicolas Liochon <[email protected]> Committed: Tue Jul 22 15:03:23 2014 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java | 8 ++++---- hbase-common/src/main/resources/hbase-default.xml | 4 ++-- .../src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java | 3 +-- .../org/apache/hadoop/hbase/TestFullLogReconstruction.java | 2 +- .../test/java/org/apache/hadoop/hbase/client/TestAdmin.java | 5 +++-- .../hadoop/hbase/regionserver/wal/TestLogRollAbort.java | 5 +++-- .../apache/hadoop/hbase/regionserver/wal/TestLogRolling.java | 5 +++-- hbase-shell/src/main/ruby/hbase/hbase.rb | 2 +- 8 files changed, 18 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/ee5c109b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java index 3872367..74c8cc8 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java @@ -138,8 +138,8 @@ public class RpcClient { private final boolean fallbackAllowed; private UserProvider userProvider; - final private static String PING_INTERVAL_NAME = "ipc.ping.interval"; - final private static String SOCKET_TIMEOUT = "ipc.socket.timeout"; + final public static String PING_INTERVAL_NAME = "hbase.ipc.ping.interval"; + final public static String SOCKET_TIMEOUT = "hbase.ipc.socket.timeout"; final static int DEFAULT_PING_INTERVAL = 60000; // 1 min final static int DEFAULT_SOCKET_TIMEOUT = 20000; // 20 seconds final static int PING_CALL_ID = -1; @@ -244,7 +244,7 @@ public class RpcClient { * @return the ping interval */ static int getPingInterval(Configuration conf) { - return conf.getInt(PING_INTERVAL_NAME, DEFAULT_PING_INTERVAL); + return conf.getInt(PING_INTERVAL_NAME, conf.getInt("ipc.ping.interval", DEFAULT_PING_INTERVAL)); } /** @@ -260,7 +260,7 @@ public class RpcClient { * @return the socket timeout */ static int getSocketTimeout(Configuration conf) { - return conf.getInt(SOCKET_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + return conf.getInt(SOCKET_TIMEOUT, conf.getInt("ipc.socket.timeout", DEFAULT_SOCKET_TIMEOUT)); } /** A call waiting for a value. */ http://git-wip-us.apache.org/repos/asf/hbase/blob/ee5c109b/hbase-common/src/main/resources/hbase-default.xml ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index a5052ee..9bc3c59 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -198,14 +198,14 @@ possible configurations would overwhelm and obscure the important. Same property is used by the Master for count of master handlers.</description> </property> <property> - <name>ipc.server.callqueue.handler.factor</name> + <name>hbase.ipc.server.callqueue.handler.factor</name> <value>0.1</value> <description>Factor to determine the number of call queues. A value of 0 means a single queue shared between all the handlers. A value of 1 means that each handler has its own queue.</description> </property> <property> - <name>ipc.server.callqueue.read.share</name> + <name>hbase.ipc.server.callqueue.read.share</name> <value>0</value> <description>Split the call queues into read and write queues. A value of 0 indicate to not split the call queues. http://git-wip-us.apache.org/repos/asf/hbase/blob/ee5c109b/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 bad389e..8ff70fe 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 @@ -1876,8 +1876,7 @@ public class RpcServer implements RpcServerInterface { this.port = listener.getAddress().getPort(); this.metrics = new MetricsHBaseServer(name, new MetricsHBaseServerWrapperImpl(this)); - this.tcpNoDelay = conf.getBoolean("hbase.ipc.server.tcpnodelay", - conf.getBoolean("ipc.server.tcpnodelay", true)); + this.tcpNoDelay = conf.getBoolean("hbase.ipc.server.tcpnodelay", true); this.tcpKeepAlive = conf.getBoolean("hbase.ipc.server.tcpkeepalive", conf.getBoolean("ipc.server.tcpkeepalive", true)); http://git-wip-us.apache.org/repos/asf/hbase/blob/ee5c109b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java index d5d12bf..0fbcf81 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java @@ -52,7 +52,7 @@ public class TestFullLogReconstruction { c.setInt("dfs.heartbeat.interval", 1); c.setInt("dfs.socket.timeout", 5000); // faster failover with cluster.shutdown();fs.close() idiom - c.setInt("ipc.client.connect.max.retries", 1); + c.setInt("hbase.ipc.client.connect.max.retries", 1); c.setInt("hbase.ipc.client.connect.max.retries", 1); c.setInt("dfs.client.block.recovery.retries", 1); c.setInt(HConstants.ZK_SESSION_TIMEOUT, 1000); http://git-wip-us.apache.org/repos/asf/hbase/blob/ee5c109b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java index 5dafaa6..351f364 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java @@ -58,6 +58,7 @@ import org.apache.hadoop.hbase.ZooKeeperConnectionException; import org.apache.hadoop.hbase.catalog.CatalogTracker; import org.apache.hadoop.hbase.constraint.ConstraintException; import org.apache.hadoop.hbase.executor.EventHandler; +import org.apache.hadoop.hbase.ipc.RpcClient; import org.apache.hadoop.hbase.master.AssignmentManager; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; @@ -1551,8 +1552,8 @@ public class TestAdmin { TEST_UTIL.getConfiguration().setInt( "hbase.regionserver.logroll.errors.tolerated", 2); - TEST_UTIL.getConfiguration().setInt("ipc.ping.interval", 10 * 1000); - TEST_UTIL.getConfiguration().setInt("ipc.socket.timeout", 10 * 1000); + TEST_UTIL.getConfiguration().setInt(RpcClient.PING_INTERVAL_NAME, 10 * 1000); + TEST_UTIL.getConfiguration().setInt(RpcClient.SOCKET_TIMEOUT, 10 * 1000); TEST_UTIL.getConfiguration().setInt("hbase.rpc.timeout", 10 * 1000); // For less frequently updated regions flush after every 2 flushes http://git-wip-us.apache.org/repos/asf/hbase/blob/ee5c109b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java index 1e2ce59..c1ed4c3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java @@ -27,6 +27,7 @@ import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; +import org.apache.hadoop.hbase.ipc.RpcClient; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.util.Bytes; @@ -71,8 +72,8 @@ public class TestLogRollAbort { // Tweak default timeout values down for faster recovery TEST_UTIL.getConfiguration().setInt( "hbase.regionserver.logroll.errors.tolerated", 2); - TEST_UTIL.getConfiguration().setInt("ipc.ping.interval", 10 * 1000); - TEST_UTIL.getConfiguration().setInt("ipc.socket.timeout", 10 * 1000); + TEST_UTIL.getConfiguration().setInt(RpcClient.PING_INTERVAL_NAME, 10 * 1000); + TEST_UTIL.getConfiguration().setInt(RpcClient.SOCKET_TIMEOUT, 10 * 1000); TEST_UTIL.getConfiguration().setInt("hbase.rpc.timeout", 10 * 1000); // Increase the amount of time between client retries http://git-wip-us.apache.org/repos/asf/hbase/blob/ee5c109b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java index 557212e..868a34d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java @@ -55,6 +55,7 @@ import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.fs.HFileSystem; +import org.apache.hadoop.hbase.ipc.RpcClient; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.regionserver.Store; @@ -137,8 +138,8 @@ public class TestLogRolling { TEST_UTIL.getConfiguration().setInt( "hbase.regionserver.logroll.errors.tolerated", 2); - TEST_UTIL.getConfiguration().setInt("ipc.ping.interval", 10 * 1000); - TEST_UTIL.getConfiguration().setInt("ipc.socket.timeout", 10 * 1000); + TEST_UTIL.getConfiguration().setInt(RpcClient.PING_INTERVAL_NAME, 10 * 1000); + TEST_UTIL.getConfiguration().setInt(RpcClient.SOCKET_TIMEOUT, 10 * 1000); TEST_UTIL.getConfiguration().setInt("hbase.rpc.timeout", 10 * 1000); // For less frequently updated regions flush after every 2 flushes http://git-wip-us.apache.org/repos/asf/hbase/blob/ee5c109b/hbase-shell/src/main/ruby/hbase/hbase.rb ---------------------------------------------------------------------- diff --git a/hbase-shell/src/main/ruby/hbase/hbase.rb b/hbase-shell/src/main/ruby/hbase/hbase.rb index 8c8d2b1..e75535e 100644 --- a/hbase-shell/src/main/ruby/hbase/hbase.rb +++ b/hbase-shell/src/main/ruby/hbase/hbase.rb @@ -36,7 +36,7 @@ module Hbase self.configuration = org.apache.hadoop.hbase.HBaseConfiguration.create # Turn off retries in hbase and ipc. Human doesn't want to wait on N retries. configuration.setInt("hbase.client.retries.number", 7) - configuration.setInt("ipc.client.connect.max.retries", 3) + configuration.setInt("hbase.ipc.client.connect.max.retries", 3) end end
