Index: src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java (revision 1038402) +++ src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java (working copy) @@ -125,6 +125,10 @@ } } + // Set the max session timeout from the provided client-side timeout + properties.setProperty("maxSessionTimeout", + conf.get("zookeeper.session.timeout", "180000")); + if (myId == -1) { throw new IOException("Could not find my address: " + myAddress + " in list of ZooKeeper quorum servers"); Index: src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java (revision 1038402) +++ src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java (working copy) @@ -91,7 +91,7 @@ if(ensemble == null) { throw new IOException("Unable to determine ZooKeeper ensemble"); } - int timeout = conf.getInt("zookeeper.session.timeout", 60 * 1000); + int timeout = conf.getInt("zookeeper.session.timeout", 180 * 1000); LOG.debug(descriptor + " opening connection to ZooKeeper with ensemble (" + ensemble + ")"); return new ZooKeeper(ensemble, timeout, watcher); Index: src/main/java/org/apache/hadoop/hbase/master/HMaster.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/HMaster.java (revision 1038402) +++ src/main/java/org/apache/hadoop/hbase/master/HMaster.java (working copy) @@ -239,7 +239,7 @@ while (!amm.isActiveMaster()) { LOG.debug("Waiting for master address ZNode to be written " + "(Also watching cluster state node)"); - Thread.sleep(c.getInt("zookeeper.session.timeout", 60 * 1000)); + Thread.sleep(c.getInt("zookeeper.session.timeout", 180 * 1000)); } } Index: src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java (revision 1038402) +++ src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java (working copy) @@ -121,7 +121,6 @@ if (zkClientPort == 0) { throw new IOException("No config value for hbase.zookeeper.property.clientPort"); } - zooKeeperCluster.setTickTime(conf.getInt("hbase.zookeeper.property.tickTime", 3000)); zooKeeperCluster.setClientPort(zkClientPort); int clientPort = zooKeeperCluster.startup(zkDataPath); if (clientPort != zkClientPort) { Index: src/main/resources/hbase-default.xml =================================================================== --- src/main/resources/hbase-default.xml (revision 1038402) +++ src/main/resources/hbase-default.xml (working copy) @@ -451,7 +451,7 @@ zookeeper.session.timeout - 60000 + 180000 ZooKeeper session timeout. HBase passes this to the zk quorum as suggested maximum time for a session. See http://hadoop.apache.org/zookeeper/docs/current/zookeeperProgrammers.html#ch_zkSessions