Author: umamahesh
Date: Thu Nov 15 18:28:29 2012
New Revision: 1409907
URL: http://svn.apache.org/viewvc?rev=1409907&view=rev
Log:
Merge HDFS-3623. BKJM: zkLatchWaitTimeout hard coded to 6000. Make use of
ZKSessionTimeout instead. Contributed by Uma Maheswara Rao G.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/ (props changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/ (props
changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperJournalManager.java
Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-hdfs-project:r1409905
Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:r1409905
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1409907&r1=1409906&r2=1409907&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Thu Nov 15 18:28:29 2012
@@ -241,6 +241,9 @@ Release 2.0.3-alpha - Unreleased
HDFS-4104. dfs -test -d prints inappropriate error on nonexistent directory
(Andy Isaacson via daryn)
+ HDFS-3623. BKJM: zkLatchWaitTimeout hard coded to 6000. Make use of
ZKSessionTimeout instead.
+ (umamahesh)
+
Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperJournalManager.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperJournalManager.java?rev=1409907&r1=1409906&r2=1409907&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperJournalManager.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperJournalManager.java
Thu Nov 15 18:28:29 2012
@@ -180,9 +180,16 @@ public class BookKeeperJournalManager im
try {
zkConnectLatch = new CountDownLatch(1);
- zkc = new ZooKeeper(zkConnect, conf.getInt(BKJM_ZK_SESSION_TIMEOUT,
- BKJM_ZK_SESSION_TIMEOUT_DEFAULT), new ZkConnectionWatcher());
- if (!zkConnectLatch.await(6000, TimeUnit.MILLISECONDS)) {
+ int bkjmZKSessionTimeout = conf.getInt(BKJM_ZK_SESSION_TIMEOUT,
+ BKJM_ZK_SESSION_TIMEOUT_DEFAULT);
+ zkc = new ZooKeeper(zkConnect, bkjmZKSessionTimeout,
+ new ZkConnectionWatcher());
+ // Configured zk session timeout + some extra grace period (here
+ // BKJM_ZK_SESSION_TIMEOUT_DEFAULT used as grace period)
+ int zkConnectionLatchTimeout = bkjmZKSessionTimeout
+ + BKJM_ZK_SESSION_TIMEOUT_DEFAULT;
+ if (!zkConnectLatch
+ .await(zkConnectionLatchTimeout, TimeUnit.MILLISECONDS)) {
throw new IOException("Error connecting to zookeeper");
}
