Return-Path: Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org Received: (qmail 38900 invoked from network); 18 Jun 2008 19:20:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Jun 2008 19:20:53 -0000 Received: (qmail 92781 invoked by uid 500); 18 Jun 2008 19:20:51 -0000 Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org Received: (qmail 92743 invoked by uid 500); 18 Jun 2008 19:20:51 -0000 Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: core-dev@hadoop.apache.org Delivered-To: mailing list core-commits@hadoop.apache.org Received: (qmail 92730 invoked by uid 99); 18 Jun 2008 19:20:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jun 2008 12:20:51 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jun 2008 19:20:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EF3C423889F1; Wed, 18 Jun 2008 12:19:57 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r669258 - in /hadoop/core/trunk: CHANGES.txt src/hdfs/org/apache/hadoop/dfs/UpgradeManagerDatanode.java Date: Wed, 18 Jun 2008 19:19:57 -0000 To: core-commits@hadoop.apache.org From: dhruba@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080618191957.EF3C423889F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dhruba Date: Wed Jun 18 12:19:57 2008 New Revision: 669258 URL: http://svn.apache.org/viewvc?rev=669258&view=rev Log: HADOOP-3520. TestDFSUpgradeFromImage triggers a race condition in the Upgrade Manager. Fixed. (dhruba) Modified: hadoop/core/trunk/CHANGES.txt hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeManagerDatanode.java Modified: hadoop/core/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=669258&r1=669257&r2=669258&view=diff ============================================================================== --- hadoop/core/trunk/CHANGES.txt (original) +++ hadoop/core/trunk/CHANGES.txt Wed Jun 18 12:19:57 2008 @@ -622,6 +622,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/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeManagerDatanode.java URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeManagerDatanode.java?rev=669258&r1=669257&r2=669258&view=diff ============================================================================== --- hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeManagerDatanode.java (original) +++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeManagerDatanode.java Wed Jun 18 12:19:57 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 "