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:
parent
a9e69cce21
commit
8b3a90236b
|
@ -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", 1800000));
|
||||
this, conf.getInt("hbase.master.catalog.timeout", Integer.MAX_VALUE));
|
||||
this.catalogTracker.start();
|
||||
|
||||
this.balancer = LoadBalancerFactory.getLoadBalancer(conf);
|
||||
|
|
|
@ -766,7 +766,7 @@ public class HRegionServer implements ClientProtocol,
|
|||
|
||||
// Create the catalog tracker and start it;
|
||||
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();
|
||||
}
|
||||
|
||||
|
|
|
@ -895,14 +895,4 @@
|
|||
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>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>
|
||||
|
|
Loading…
Reference in New Issue