From 17007685c1ad2c4b7e672afaaf43b50f6c3a7c5c Mon Sep 17 00:00:00 2001 From: Jan Hentschel Date: Sun, 19 Feb 2017 00:06:25 +0100 Subject: [PATCH] HBASE-13074 Cleaned up usage of hbase.master.lease.thread.wakefrequency Signed-off-by: Chia-Ping Tsai --- hbase-rest/src/test/resources/hbase-site.xml | 8 -------- .../hbase/coprocessor/TestCoprocessorInterface.java | 3 --- .../org/apache/hadoop/hbase/regionserver/TestHRegion.java | 3 --- hbase-server/src/test/resources/hbase-site.xml | 8 -------- hbase-server/src/test/resources/hbase-site2.xml | 8 -------- hbase-spark/src/test/resources/hbase-site.xml | 8 -------- hbase-thrift/src/test/resources/hbase-site.xml | 8 -------- 7 files changed, 46 deletions(-) diff --git a/hbase-rest/src/test/resources/hbase-site.xml b/hbase-rest/src/test/resources/hbase-site.xml index b96641c1469..2bd3ee45a42 100644 --- a/hbase-rest/src/test/resources/hbase-site.xml +++ b/hbase-rest/src/test/resources/hbase-site.xml @@ -91,14 +91,6 @@ Enabled for testing to run multiple tests on one machine. - - hbase.master.lease.thread.wakefrequency - 3000 - The interval between checks for expired region server leases. - This value has been reduced due to the other reduced values above so that - the master will notice a dead region server sooner. The default is 15 seconds. - - hbase.regionserver.safemode false 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 8d8b6df5fe2..7013c8c0944 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 @@ -424,9 +424,6 @@ public class TestCoprocessorInterface { private Configuration initConfig() { // Always compact if there is more than one store file. TEST_UTIL.getConfiguration().setInt("hbase.hstore.compactionThreshold", 2); - // Make lease timeout longer, lease checks less frequent - TEST_UTIL.getConfiguration().setInt( - "hbase.master.lease.thread.wakefrequency", 5 * 1000); TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, 10 * 1000); // Increase the amount of time between client retries TEST_UTIL.getConfiguration().setLong("hbase.client.pause", 15 * 1000); 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 53f0892c42d..ed0b9ddec0d 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 @@ -4896,9 +4896,6 @@ public class TestHRegion { // Always compact if there is more than one store file. CONF.setInt("hbase.hstore.compactionThreshold", 2); - // Make lease timeout longer, lease checks less frequent - CONF.setInt("hbase.master.lease.thread.wakefrequency", 5 * 1000); - CONF.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, 10 * 1000); // Increase the amount of time between client retries diff --git a/hbase-server/src/test/resources/hbase-site.xml b/hbase-server/src/test/resources/hbase-site.xml index bfe8ee13365..64a19644358 100644 --- a/hbase-server/src/test/resources/hbase-site.xml +++ b/hbase-server/src/test/resources/hbase-site.xml @@ -99,14 +99,6 @@ Enabled for testing to run multiple tests on one machine. - - hbase.master.lease.thread.wakefrequency - 3000 - The interval between checks for expired region server leases. - This value has been reduced due to the other reduced values above so that - the master will notice a dead region server sooner. The default is 15 seconds. - - hbase.regionserver.safemode false diff --git a/hbase-server/src/test/resources/hbase-site2.xml b/hbase-server/src/test/resources/hbase-site2.xml index 1582826c802..8bef31a4d77 100644 --- a/hbase-server/src/test/resources/hbase-site2.xml +++ b/hbase-server/src/test/resources/hbase-site2.xml @@ -95,14 +95,6 @@ Enabled for testing to run multiple tests on one machine. - - hbase.master.lease.thread.wakefrequency - 3000 - The interval between checks for expired region server leases. - This value has been reduced due to the other reduced values above so that - the master will notice a dead region server sooner. The default is 15 seconds. - - hbase.regionserver.safemode false diff --git a/hbase-spark/src/test/resources/hbase-site.xml b/hbase-spark/src/test/resources/hbase-site.xml index 1dba56a9adc..b3fb0d90c50 100644 --- a/hbase-spark/src/test/resources/hbase-site.xml +++ b/hbase-spark/src/test/resources/hbase-site.xml @@ -99,14 +99,6 @@ Enabled for testing to run multiple tests on one machine. - - hbase.master.lease.thread.wakefrequency - 3000 - The interval between checks for expired region server leases. - This value has been reduced due to the other reduced values above so that - the master will notice a dead region server sooner. The default is 15 seconds. - - hbase.regionserver.safemode false diff --git a/hbase-thrift/src/test/resources/hbase-site.xml b/hbase-thrift/src/test/resources/hbase-site.xml index 1dba56a9adc..b3fb0d90c50 100644 --- a/hbase-thrift/src/test/resources/hbase-site.xml +++ b/hbase-thrift/src/test/resources/hbase-site.xml @@ -99,14 +99,6 @@ Enabled for testing to run multiple tests on one machine. - - hbase.master.lease.thread.wakefrequency - 3000 - The interval between checks for expired region server leases. - This value has been reduced due to the other reduced values above so that - the master will notice a dead region server sooner. The default is 15 seconds. - - hbase.regionserver.safemode false