From a9e69cce21453c0cf99235dfa3358b0251311010 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Thu, 30 Aug 2012 23:13:36 +0000 Subject: [PATCH] HBASE-6684 .META. timeout value is incorrect git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1379215 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/hadoop/hbase/master/HMaster.java | 2 +- .../hadoop/hbase/regionserver/HRegionServer.java | 2 +- hbase-server/src/main/resources/hbase-default.xml | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 22c4570ff64..d871ee7514c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -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", 1800000)); this.catalogTracker.start(); this.balancer = LoadBalancerFactory.getLoadBalancer(conf); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 802ccb4dd09..73def178d67 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -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", Integer.MAX_VALUE)); + this, this.conf.getInt("hbase.regionserver.catalog.timeout", 1800000)); catalogTracker.start(); } diff --git a/hbase-server/src/main/resources/hbase-default.xml b/hbase-server/src/main/resources/hbase-default.xml index 3943bdd9290..b71ece094bd 100644 --- a/hbase-server/src/main/resources/hbase-default.xml +++ b/hbase-server/src/main/resources/hbase-default.xml @@ -895,4 +895,14 @@ default log cleaners in the list as they will be overwritten in hbase-site.xml. + + hbase.regionserver.catalog.timeout + 1800000 + Timeout value for the Catalog Janitor from the regionserver to META. + + + hbase.master.catalog.timeout + 1800000 + Timeout value for the Catalog Janitor from the master to META. +