Author: dhruba
Date: Wed Jun 18 12:21:51 2008
New Revision: 669260
URL: http://svn.apache.org/viewvc?rev=669260&view=rev
Log:
HADOOP-3520. TestDFSUpgradeFromImage triggers a race condition in the
Upgrade Manager. Fixed. (dhruba)
svn merge -c 669258 from trunk
Modified:
hadoop/core/branches/branch-0.18/CHANGES.txt
hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/UpgradeManagerDatanode.java
Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=669260&r1=669259&r2=669260&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Wed Jun 18 12:21:51 2008
@@ -611,6 +611,9 @@
HADOOP-3539. Fix the tool path in the bin/hadoop script under
cygwin. (Tsz Wo (Nicholas), Sze via omalley)
+ HADOOP-3520. TestDFSUpgradeFromImage triggers a race condition in the
+ Upgrade Manager. Fixed. (dhruba)
+
Release 0.17.1 - Unreleased
INCOMPATIBLE CHANGES
Modified:
hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/UpgradeManagerDatanode.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/UpgradeManagerDatanode.java?rev=669260&r1=669259&r2=669260&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/UpgradeManagerDatanode.java
(original)
+++
hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/UpgradeManagerDatanode.java
Wed Jun 18 12:21:51 2008
@@ -18,7 +18,6 @@
package org.apache.hadoop.dfs;
import java.io.IOException;
-import java.net.SocketTimeoutException;
import org.apache.hadoop.util.Daemon;
@@ -44,7 +43,7 @@
return FSConstants.NodeType.DATA_NODE;
}
- void initializeUpgrade(NamespaceInfo nsInfo) throws IOException {
+ synchronized void initializeUpgrade(NamespaceInfo nsInfo) throws IOException
{
if( ! super.initializeUpgrade())
return; // distr upgrade is not needed
DataNode.LOG.info("\n Distributed upgrade for DataNode "
