You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ch...@apache.org on 2017/05/02 15:13:33 UTC

hbase git commit: HBASE-13074 Cleaned up usage of hbase.master.lease.thread.wakefrequency

Repository: hbase
Updated Branches:
  refs/heads/master c8a7e80e0 -> 17007685c


HBASE-13074 Cleaned up usage of hbase.master.lease.thread.wakefrequency

Signed-off-by: Chia-Ping Tsai <ch...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/17007685
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/17007685
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/17007685

Branch: refs/heads/master
Commit: 17007685c1ad2c4b7e672afaaf43b50f6c3a7c5c
Parents: c8a7e80
Author: Jan Hentschel <ja...@ultratendency.com>
Authored: Sun Feb 19 00:06:25 2017 +0100
Committer: Chia-Ping Tsai <ch...@gmail.com>
Committed: Tue May 2 23:12:02 2017 +0800

----------------------------------------------------------------------
 hbase-rest/src/test/resources/hbase-site.xml                 | 8 --------
 .../hadoop/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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/17007685/hbase-rest/src/test/resources/hbase-site.xml
----------------------------------------------------------------------
diff --git a/hbase-rest/src/test/resources/hbase-site.xml b/hbase-rest/src/test/resources/hbase-site.xml
index b96641c..2bd3ee4 100644
--- a/hbase-rest/src/test/resources/hbase-site.xml
+++ b/hbase-rest/src/test/resources/hbase-site.xml
@@ -92,14 +92,6 @@
     </description>
   </property>
   <property>
-    <name>hbase.master.lease.thread.wakefrequency</name>
-    <value>3000</value>
-    <description>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.
-    </description>
-  </property>
-  <property>
     <name>hbase.regionserver.safemode</name>
     <value>false</value>
     <description>

http://git-wip-us.apache.org/repos/asf/hbase/blob/17007685/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java
----------------------------------------------------------------------
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 8d8b6df..7013c8c 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);

http://git-wip-us.apache.org/repos/asf/hbase/blob/17007685/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
----------------------------------------------------------------------
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 53f0892..ed0b9dd 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

http://git-wip-us.apache.org/repos/asf/hbase/blob/17007685/hbase-server/src/test/resources/hbase-site.xml
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/resources/hbase-site.xml b/hbase-server/src/test/resources/hbase-site.xml
index bfe8ee1..64a1964 100644
--- a/hbase-server/src/test/resources/hbase-site.xml
+++ b/hbase-server/src/test/resources/hbase-site.xml
@@ -100,14 +100,6 @@
     </description>
   </property>
   <property>
-    <name>hbase.master.lease.thread.wakefrequency</name>
-    <value>3000</value>
-    <description>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.
-    </description>
-  </property>
-  <property>
     <name>hbase.regionserver.safemode</name>
     <value>false</value>
     <description>

http://git-wip-us.apache.org/repos/asf/hbase/blob/17007685/hbase-server/src/test/resources/hbase-site2.xml
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/resources/hbase-site2.xml b/hbase-server/src/test/resources/hbase-site2.xml
index 1582826..8bef31a 100644
--- a/hbase-server/src/test/resources/hbase-site2.xml
+++ b/hbase-server/src/test/resources/hbase-site2.xml
@@ -96,14 +96,6 @@
     </description>
   </property>
   <property>
-    <name>hbase.master.lease.thread.wakefrequency</name>
-    <value>3000</value>
-    <description>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.
-    </description>
-  </property>
-  <property>
     <name>hbase.regionserver.safemode</name>
     <value>false</value>
     <description>

http://git-wip-us.apache.org/repos/asf/hbase/blob/17007685/hbase-spark/src/test/resources/hbase-site.xml
----------------------------------------------------------------------
diff --git a/hbase-spark/src/test/resources/hbase-site.xml b/hbase-spark/src/test/resources/hbase-site.xml
index 1dba56a..b3fb0d9 100644
--- a/hbase-spark/src/test/resources/hbase-site.xml
+++ b/hbase-spark/src/test/resources/hbase-site.xml
@@ -100,14 +100,6 @@
     </description>
   </property>
   <property>
-    <name>hbase.master.lease.thread.wakefrequency</name>
-    <value>3000</value>
-    <description>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.
-    </description>
-  </property>
-  <property>
     <name>hbase.regionserver.safemode</name>
     <value>false</value>
     <description>

http://git-wip-us.apache.org/repos/asf/hbase/blob/17007685/hbase-thrift/src/test/resources/hbase-site.xml
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/test/resources/hbase-site.xml b/hbase-thrift/src/test/resources/hbase-site.xml
index 1dba56a..b3fb0d9 100644
--- a/hbase-thrift/src/test/resources/hbase-site.xml
+++ b/hbase-thrift/src/test/resources/hbase-site.xml
@@ -100,14 +100,6 @@
     </description>
   </property>
   <property>
-    <name>hbase.master.lease.thread.wakefrequency</name>
-    <value>3000</value>
-    <description>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.
-    </description>
-  </property>
-  <property>
     <name>hbase.regionserver.safemode</name>
     <value>false</value>
     <description>