You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/08/31 01:16:10 UTC
svn commit: r1379217 - in /hbase/trunk/hbase-server/src/main:
java/org/apache/hadoop/hbase/master/HMaster.java
java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
resources/hbase-default.xml
Author: stack
Date: Thu Aug 30 23:16:10 2012
New Revision: 1379217
URL: http://svn.apache.org/viewvc?rev=1379217&view=rev
Log:
HBASE-6684 .META. timeout value is incorrect; REAPPLY
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
hbase/trunk/hbase-server/src/main/resources/hbase-default.xml
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1379217&r1=1379216&r2=1379217&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Thu Aug 30 23:16:10 2012
@@ -507,7 +507,7 @@ Server {
private void initializeZKBasedSystemTrackers() throws IOException,
InterruptedException, KeeperException {
this.catalogTracker = createCatalogTracker(this.zooKeeper, this.conf,
- this, conf.getInt("hbase.master.catalog.timeout", Integer.MAX_VALUE));
+ this, conf.getInt("hbase.master.catalog.timeout", 600000));
this.catalogTracker.start();
this.balancer = LoadBalancerFactory.getLoadBalancer(conf);
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1379217&r1=1379216&r2=1379217&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Thu Aug 30 23:16:10 2012
@@ -766,7 +766,7 @@ public class HRegionServer implements C
// Create the catalog tracker and start it;
this.catalogTracker = new CatalogTracker(this.zooKeeper, this.conf,
- this, this.conf.getInt("hbase.regionserver.catalog.timeout", Integer.MAX_VALUE));
+ this, this.conf.getInt("hbase.regionserver.catalog.timeout", 600000));
catalogTracker.start();
}
Modified: hbase/trunk/hbase-server/src/main/resources/hbase-default.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/resources/hbase-default.xml?rev=1379217&r1=1379216&r2=1379217&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/resources/hbase-default.xml (original)
+++ hbase/trunk/hbase-server/src/main/resources/hbase-default.xml Thu Aug 30 23:16:10 2012
@@ -895,4 +895,14 @@
default log cleaners in the list as they will be overwritten in hbase-site.xml.
</description>
</property>
+ <property>
+ <name>hbase.regionserver.catalog.timeout</name>
+ <value>600000</value>
+ <description>Timeout value for the Catalog Janitor from the regionserver to META.</description>
+ </property>
+ <property>
+ <name>hbase.master.catalog.timeout</name>
+ <value>600000</value>
+ <description>Timeout value for the Catalog Janitor from the master to META.</description>
+ </property>
</configuration>