Index: src/test/org/apache/hadoop/hbase/regionserver/TestHRegion.java =================================================================== --- src/test/org/apache/hadoop/hbase/regionserver/TestHRegion.java (revision 907798) +++ src/test/org/apache/hadoop/hbase/regionserver/TestHRegion.java (working copy) @@ -1887,7 +1887,7 @@ // Make lease timeout longer, lease checks less frequent conf.setInt("hbase.master.lease.thread.wakefrequency", 5 * 1000); - conf.setInt("hbase.regionserver.lease.period", 10 * 1000); + conf.setInt(HConstants.HBASE_REGIONSERVER_LEASE_PERIOD_KEY, 10 * 1000); // Increase the amount of time between client retries conf.setLong("hbase.client.pause", 15 * 1000); Index: src/contrib/mdc_replication/src/java/org/apache/hadoop/hbase/replication/ReplicationConnectionManager.java =================================================================== --- src/contrib/mdc_replication/src/java/org/apache/hadoop/hbase/replication/ReplicationConnectionManager.java (revision 907798) +++ src/contrib/mdc_replication/src/java/org/apache/hadoop/hbase/replication/ReplicationConnectionManager.java (working copy) @@ -56,7 +56,7 @@ conf.get(REGION_SERVER_CLASS, DEFAULT_REGION_SERVER_CLASS); this.numRetries = conf.getInt("hbase.client.retries.number", 10); this.maxRPCAttempts = conf.getInt("hbase.client.rpc.maxattempts", 1); - this.rpcTimeout = conf.getLong("hbase.regionserver.lease.period", 60000); + this.rpcTimeout = conf.getLong(HBASE_REGIONSERVER_LEASE_PERIOD_KEY, DEFAULT_HBASE_REGIONSERVER_LEASE_PERIOD); try { this.serverInterfaceClass = (Class) Index: src/java/org/apache/hadoop/hbase/HConstants.java =================================================================== --- src/java/org/apache/hadoop/hbase/HConstants.java (revision 907798) +++ src/java/org/apache/hadoop/hbase/HConstants.java (working copy) @@ -304,5 +304,18 @@ * The default value is unlimited. */ public static long DEFAULT_HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE = Long.MAX_VALUE; + + + /** + * HRegion server lease period in milliseconds. Clients must report in within this period + * else they are considered dead. Unit measured in ms (milliseconds). + */ + public static String HBASE_REGIONSERVER_LEASE_PERIOD_KEY = "hbase.regionserver.lease.period"; + + + /** + * Default value of {@link #HBASE_REGIONSERVER_LEASE_PERIOD_KEY}. + */ + public static long DEFAULT_HBASE_REGIONSERVER_LEASE_PERIOD = 60000; } Index: src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java =================================================================== --- src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision 907798) +++ src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (working copy) @@ -268,7 +268,7 @@ this.numRegionsToReport = conf.getInt("hbase.regionserver.numregionstoreport", 10); - this.rpcTimeout = conf.getLong("hbase.regionserver.lease.period", 60000); + this.rpcTimeout = conf.getLong(HBASE_REGIONSERVER_LEASE_PERIOD_KEY, DEFAULT_HBASE_REGIONSERVER_LEASE_PERIOD); reinitialize(); } @@ -332,7 +332,7 @@ this.threadWakeFrequency * multiplier, this.stopRequested); this.leases = new Leases( - conf.getInt("hbase.regionserver.lease.period", 60 * 1000), + (int) conf.getLong(HBASE_REGIONSERVER_LEASE_PERIOD_KEY, DEFAULT_HBASE_REGIONSERVER_LEASE_PERIOD), this.threadWakeFrequency); } Index: src/java/org/apache/hadoop/hbase/client/HTable.java =================================================================== --- src/java/org/apache/hadoop/hbase/client/HTable.java (revision 907798) +++ src/java/org/apache/hadoop/hbase/client/HTable.java (working copy) @@ -118,7 +118,7 @@ } this.connection = HConnectionManager.getConnection(conf); this.scannerTimeout = - conf.getInt("hbase.regionserver.lease.period", 60 * 1000); + (int) conf.getLong(HConstants.HBASE_REGIONSERVER_LEASE_PERIOD_KEY, HConstants.DEFAULT_HBASE_REGIONSERVER_LEASE_PERIOD); this.configuration = conf; this.connection.locateRegion(tableName, HConstants.EMPTY_START_ROW); this.writeBufferSize = conf.getLong("hbase.client.write.buffer", 2097152); Index: src/java/org/apache/hadoop/hbase/client/HConnectionManager.java =================================================================== --- src/java/org/apache/hadoop/hbase/client/HConnectionManager.java (revision 907798) +++ src/java/org/apache/hadoop/hbase/client/HConnectionManager.java (working copy) @@ -295,7 +295,7 @@ this.pause = conf.getLong("hbase.client.pause", 1 * 1000); this.numRetries = conf.getInt("hbase.client.retries.number", 10); this.maxRPCAttempts = conf.getInt("hbase.client.rpc.maxattempts", 1); - this.rpcTimeout = conf.getLong("hbase.regionserver.lease.period", 60000); + this.rpcTimeout = conf.getLong(HBASE_REGIONSERVER_LEASE_PERIOD_KEY, DEFAULT_HBASE_REGIONSERVER_LEASE_PERIOD); this.master = null; this.masterChecked = false;