You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ns...@apache.org on 2011/10/11 04:07:18 UTC
svn commit: r1181422 - in
/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase: HConstants.java
client/HConnectionManager.java regionserver/HRegionServer.java
Author: nspiegelberg
Date: Tue Oct 11 02:07:17 2011
New Revision: 1181422
URL: http://svn.apache.org/viewvc?rev=1181422&view=rev
Log:
Add a RPC timeout configuration to HBase
Summary:
add a new configuration "hbase.rpc.timeout"
Test Plan:
manual test
DiffCamp Revision: 175187
Reviewed By: kannan
Revert Plan:
OK
Modified:
hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/HConstants.java
hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/HConstants.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/HConstants.java?rev=1181422&r1=1181421&r2=1181422&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/HConstants.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/HConstants.java Tue Oct 11 02:07:17 2011
@@ -356,6 +356,16 @@ public final class HConstants {
*/
public static long DEFAULT_HBASE_REGIONSERVER_LEASE_PERIOD = 60000;
+ /**
+ * timeout for each RPC
+ */
+ public static String HBASE_RPC_TIMEOUT_KEY = "hbase.rpc.timeout";
+
+ /**
+ * Default value of {@link #HBASE_RPC_TIMEOUT_KEY}
+ */
+ public static int DEFAULT_HBASE_RPC_TIMEOUT = 60000;
+
public static final String
REPLICATION_ENABLE_KEY = "hbase.replication";
Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1181422&r1=1181421&r2=1181422&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java Tue Oct 11 02:07:17 2011
@@ -275,7 +275,7 @@ public class HConnectionManager {
private final long pause;
private final int numRetries;
private final int maxRPCAttempts;
- private final long rpcTimeout;
+ private final int rpcTimeout;
private final int prefetchRegionLimit;
private final Object masterLock = new Object();
@@ -331,9 +331,9 @@ public class HConnectionManager {
this.pause = conf.getLong("hbase.client.pause", 1000);
this.numRetries = conf.getInt("hbase.client.retries.number", 10);
this.maxRPCAttempts = conf.getInt("hbase.client.rpc.maxattempts", 1);
- this.rpcTimeout = conf.getLong(
- HConstants.HBASE_REGIONSERVER_LEASE_PERIOD_KEY,
- HConstants.DEFAULT_HBASE_REGIONSERVER_LEASE_PERIOD);
+ this.rpcTimeout = conf.getInt(
+ HConstants.HBASE_RPC_TIMEOUT_KEY,
+ HConstants.DEFAULT_HBASE_RPC_TIMEOUT);
this.prefetchRegionLimit = conf.getInt("hbase.client.prefetch.limit",
10);
Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1181422&r1=1181421&r2=1181422&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Tue Oct 11 02:07:17 2011
@@ -230,7 +230,7 @@ public class HRegionServer implements HR
// A sleeper that sleeps for msgInterval.
private final Sleeper sleeper;
- private final long rpcTimeout;
+ private final int rpcTimeout;
// Address passed in to constructor. This is not always the address we run
// with. For example, if passed port is 0, then we are to pick a port. The
@@ -290,9 +290,9 @@ public class HRegionServer implements HR
this.numRegionsToReport =
conf.getInt("hbase.regionserver.numregionstoreport", 10);
- this.rpcTimeout =
- conf.getLong(HConstants.HBASE_REGIONSERVER_LEASE_PERIOD_KEY,
- HConstants.DEFAULT_HBASE_REGIONSERVER_LEASE_PERIOD);
+ this.rpcTimeout = conf.getInt(
+ HConstants.HBASE_RPC_TIMEOUT_KEY,
+ HConstants.DEFAULT_HBASE_RPC_TIMEOUT);
reinitialize();
}
@@ -1210,7 +1210,7 @@ public class HRegionServer implements HR
master = (HMasterRegionInterface)HBaseRPC.waitForProxy(
HMasterRegionInterface.class, HBaseRPCProtocolVersion.versionID,
masterAddress.getInetSocketAddress(), this.conf, -1,
- (int)this.rpcTimeout, this.rpcTimeout);
+ this.rpcTimeout, this.rpcTimeout);
} catch (IOException e) {
LOG.warn("Unable to connect to master. Retrying. Error was:", e);
sleeper.sleep();