You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by bo...@apache.org on 2012/10/01 19:50:53 UTC
svn commit: r1392475 - in
/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs:
CHANGES.txt src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
Author: bobby
Date: Mon Oct 1 17:50:53 2012
New Revision: 1392475
URL: http://svn.apache.org/viewvc?rev=1392475&view=rev
Log:
svn merge -c 1383759 FIXES: HDFS-3919. MiniDFSCluster:waitClusterUp can hang forever. Contributed by Andy Isaacson
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1392475&r1=1392474&r2=1392475&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Mon Oct 1 17:50:53 2012
@@ -12,6 +12,9 @@ Release 0.23.5 - UNRELEASED
BUG FIXES
+ HDFS-3919. MiniDFSCluster:waitClusterUp can hang forever.
+ (Andy Isaacson via eli)
+
Release 0.23.4 - UNRELEASED
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java?rev=1392475&r1=1392474&r2=1392475&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java Mon Oct 1 17:50:53 2012
@@ -731,7 +731,8 @@ public class MiniDFSCluster {
/**
* wait for the cluster to get out of safemode.
*/
- public void waitClusterUp() {
+ public void waitClusterUp() throws IOException {
+ int i = 0;
if (numDataNodes > 0) {
while (!isClusterUp()) {
try {
@@ -739,6 +740,9 @@ public class MiniDFSCluster {
Thread.sleep(1000);
} catch (InterruptedException e) {
}
+ if (++i > 10) {
+ throw new IOException("Timed out waiting for Mini HDFS Cluster to start");
+ }
}
}
}