From 365a2e72fa9c50cdf7ee7e10953f20cd6247bf0e Mon Sep 17 00:00:00 2001 From: Nick Dimiduk Date: Mon, 28 Jan 2013 16:58:16 -0800 Subject: [PATCH 1/1] HBASE-7695 remove unused variables from HRegionServer - local variable 'lock' was unused, removed. - member variable rowLockLeaseTimeoutPeriod was never referenced; apparently its reference was removed in HBASE-7315. This cascades into removal of the relevant configuration from HConstants. - remove configuration from hbase-default.xml small and medium tests pass locally. --- .../src/main/java/org/apache/hadoop/hbase/HConstants.java | 11 ----------- .../org/apache/hadoop/hbase/regionserver/HRegionServer.java | 10 ---------- hbase-server/src/main/resources/hbase-default.xml | 6 ------ .../hadoop/hbase/coprocessor/TestCoprocessorInterface.java | 8 +------- .../org/apache/hadoop/hbase/regionserver/TestHRegion.java | 1 - 5 files changed, 1 insertion(+), 35 deletions(-) diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java index 60601b7..dac6c15 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -598,17 +598,6 @@ public final class HConstants { public static String HBASE_CLIENT_INSTANCE_ID = "hbase.client.instance.id"; /** - * The row lock timeout period in milliseconds. - */ - public static String HBASE_REGIONSERVER_ROWLOCK_TIMEOUT_PERIOD = - "hbase.regionserver.rowlock.timeout.period"; - - /** - * Default value of {@link #HBASE_REGIONSERVER_ROWLOCK_TIMEOUT_PERIOD}. - */ - public static int DEFAULT_HBASE_REGIONSERVER_ROWLOCK_TIMEOUT_PERIOD = 60000; - - /** * The client scanner timeout period in milliseconds. */ public static String HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD = "hbase.client.scanner.timeout.period"; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index f831e19..1fcffcc 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -421,11 +421,6 @@ public class HRegionServer implements ClientProtocol, private MovedRegionsCleaner movedRegionsCleaner; /** - * The lease timeout period for row locks (milliseconds). - */ - private final int rowLockLeaseTimeoutPeriod; - - /** * The lease timeout period for client scanners (milliseconds). */ private final int scannerLeaseTimeoutPeriod; @@ -480,10 +475,6 @@ public class HRegionServer implements ClientProtocol, this.abortRequested = false; this.stopped = false; - this.rowLockLeaseTimeoutPeriod = conf.getInt( - HConstants.HBASE_REGIONSERVER_ROWLOCK_TIMEOUT_PERIOD, - HConstants.DEFAULT_HBASE_REGIONSERVER_ROWLOCK_TIMEOUT_PERIOD); - this.scannerLeaseTimeoutPeriod = conf.getInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, HConstants.DEFAULT_HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD); @@ -2767,7 +2758,6 @@ public class HRegionServer implements ClientProtocol, if (!region.getRegionInfo().isMetaTable()) { cacheFlusher.reclaimMemStoreMemory(); } - Integer lock; Result r = null; Boolean processed = null; MutateType type = mutate.getMutateType(); diff --git a/hbase-server/src/main/resources/hbase-default.xml b/hbase-server/src/main/resources/hbase-default.xml index 7e8dfaa..ab152be 100644 --- a/hbase-server/src/main/resources/hbase-default.xml +++ b/hbase-server/src/main/resources/hbase-default.xml @@ -167,12 +167,6 @@ 60 seconds. - hbase.regionserver.rowlock.timeout.period - 60000 - Row lock time out period in milliseconds. Default is - 60 seconds. - - hbase.regionserver.handler.count 10 Count of RPC Listener instances spun up on RegionServers. diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java index 44e1cfc..300abea 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java @@ -27,8 +27,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentMap; -import org.apache.commons.collections.map.AbstractReferenceMap; -import org.apache.commons.collections.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -46,16 +44,14 @@ import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.client.Get; -import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.regionserver.HStore; import org.apache.hadoop.hbase.regionserver.InternalScanner; import org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost; import org.apache.hadoop.hbase.regionserver.RegionScanner; import org.apache.hadoop.hbase.regionserver.SplitTransaction; -import org.apache.hadoop.hbase.regionserver.HStore; import org.apache.hadoop.hbase.regionserver.StoreFile; -import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.PairOfSameType; import org.junit.experimental.categories.Category; @@ -462,8 +458,6 @@ public class TestCoprocessorInterface extends HBaseTestCase { TEST_UTIL.getConfiguration().setInt( "hbase.master.lease.thread.wakefrequency", 5 * 1000); TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, 10 * 1000); - TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_REGIONSERVER_ROWLOCK_TIMEOUT_PERIOD, - 10 * 1000); // Increase the amount of time between client retries TEST_UTIL.getConfiguration().setLong("hbase.client.pause", 15 * 1000); // This size should make it so we always split using the addContent diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java index 32e1a01..c64164a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java @@ -3820,7 +3820,6 @@ public class TestHRegion extends HBaseTestCase { conf.setInt("hbase.master.lease.thread.wakefrequency", 5 * 1000); conf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, 10 * 1000); - conf.setInt(HConstants.HBASE_REGIONSERVER_ROWLOCK_TIMEOUT_PERIOD, 10 * 1000); // Increase the amount of time between client retries conf.setLong("hbase.client.pause", 15 * 1000); -- 1.8.1