Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-6684 .META. timeout value is incorrect; REVERT 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1379216 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2012-08-30 23:15:47 +00:00
parent a9e69cce21
commit 8b3a90236b
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

@ -507,7 +507,7 @@ Server {
private void initializeZKBasedSystemTrackers() throws IOException, private void initializeZKBasedSystemTrackers() throws IOException,
InterruptedException, KeeperException { InterruptedException, KeeperException {
this.catalogTracker = createCatalogTracker(this.zooKeeper, this.conf, this.catalogTracker = createCatalogTracker(this.zooKeeper, this.conf,
this, conf.getInt("hbase.master.catalog.timeout", 1800000)); this, conf.getInt("hbase.master.catalog.timeout", Integer.MAX_VALUE));
this.catalogTracker.start(); this.catalogTracker.start();
this.balancer = LoadBalancerFactory.getLoadBalancer(conf); this.balancer = LoadBalancerFactory.getLoadBalancer(conf);

2
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -766,7 +766,7 @@ public class HRegionServer implements ClientProtocol,
// Create the catalog tracker and start it; // Create the catalog tracker and start it;
this.catalogTracker = new CatalogTracker(this.zooKeeper, this.conf, this.catalogTracker = new CatalogTracker(this.zooKeeper, this.conf,
this, this.conf.getInt("hbase.regionserver.catalog.timeout", 1800000)); this, this.conf.getInt("hbase.regionserver.catalog.timeout", Integer.MAX_VALUE));
catalogTracker.start(); catalogTracker.start();
} }

10
hbase-server/src/main/resources/hbase-default.xml
View File

@ -895,14 +895,4 @@
default log cleaners in the list as they will be overwritten in hbase-site.xml. default log cleaners in the list as they will be overwritten in hbase-site.xml.
</description> </description>
</property> </property>
<property>
<name>hbase.regionserver.catalog.timeout</name>
<value>1800000</value>
<description>Timeout value for the Catalog Janitor from the regionserver to META.</description>
</property>
<property>
<name>hbase.master.catalog.timeout</name>
<value>1800000</value>
<description>Timeout value for the Catalog Janitor from the master to META.</description>
</property>
</configuration> </configuration>