Return-Path: Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org Received: (qmail 35053 invoked from network); 21 May 2007 22:27:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 May 2007 22:27:39 -0000 Received: (qmail 48985 invoked by uid 500); 21 May 2007 22:27:43 -0000 Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org Received: (qmail 48965 invoked by uid 500); 21 May 2007 22:27:43 -0000 Mailing-List: contact hadoop-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hadoop-dev@lucene.apache.org Delivered-To: mailing list hadoop-commits@lucene.apache.org Received: (qmail 48956 invoked by uid 99); 21 May 2007 22:27:43 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 May 2007 15:27:43 -0700 X-ASF-Spam-Status: No, hits=-98.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 May 2007 15:27:37 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id AEED91A981A; Mon, 21 May 2007 15:27:16 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r540324 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/conf/Configuration.java src/java/org/apache/hadoop/ipc/Server.java src/java/org/apache/hadoop/mapred/MapTask.java src/java/org/apache/hadoop/mapred/TaskLog.java Date: Mon, 21 May 2007 22:27:16 -0000 To: hadoop-commits@lucene.apache.org From: cutting@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070521222716.AEED91A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cutting Date: Mon May 21 15:27:11 2007 New Revision: 540324 URL: http://svn.apache.org/viewvc?view=rev&rev=540324 Log: HADOOP-1364. Fix various inconsistent synchronization issues. Contributed by Devaraj. Modified: lucene/hadoop/trunk/CHANGES.txt lucene/hadoop/trunk/src/java/org/apache/hadoop/conf/Configuration.java lucene/hadoop/trunk/src/java/org/apache/hadoop/ipc/Server.java lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapTask.java lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskLog.java Modified: lucene/hadoop/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=540324&r1=540323&r2=540324 ============================================================================== --- lucene/hadoop/trunk/CHANGES.txt (original) +++ lucene/hadoop/trunk/CHANGES.txt Mon May 21 15:27:11 2007 @@ -36,6 +36,9 @@ 11. HADOOP-1379. Add findbugs target to build.xml. (Nigel Daley via cutting) + 12. HADOOP-1364. Fix various inconsistent synchronization issues. + (Devaraj Das via cutting) + Branch 0.13 (unreleased changes) Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/conf/Configuration.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/conf/Configuration.java?view=diff&rev=540324&r1=540323&r2=540324 ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/conf/Configuration.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/conf/Configuration.java Mon May 21 15:27:11 2007 @@ -689,7 +689,7 @@ /** Make this class quiet. Error and informational * messages might not be logged. */ - public void setQuietMode(boolean value) { + public synchronized void setQuietMode(boolean value) { quietmode = value; } Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/ipc/Server.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/ipc/Server.java?view=diff&rev=540324&r1=540323&r2=540324 ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/ipc/Server.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/ipc/Server.java Mon May 21 15:27:11 2007 @@ -286,12 +286,12 @@ } LOG.info("Stopping " + this.getName()); - try { - acceptChannel.close(); - selector.close(); - } catch (IOException e) { } - synchronized (this) { + try { + acceptChannel.close(); + selector.close(); + } catch (IOException e) { } + selector= null; acceptChannel= null; connectionList = null; Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapTask.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapTask.java?view=diff&rev=540324&r1=540323&r2=540324 ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapTask.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapTask.java Mon May 21 15:27:11 2007 @@ -329,7 +329,7 @@ job.getClass("map.sort.class", MergeSorter.class, BufferSorter.class), job); } - public void startPartition(int partNumber) throws IOException { + private void startPartition(int partNumber) throws IOException { //We create the sort output as multiple sequence files within a spilled //file. So we create a writer for each partition. segmentStart = out.getPos(); Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskLog.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskLog.java?view=diff&rev=540324&r1=540323&r2=540324 ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskLog.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskLog.java Mon May 21 15:27:11 2007 @@ -367,7 +367,7 @@ * purged data. * @throws IOException */ - public long getTotalLogSize() throws IOException { + public synchronized long getTotalLogSize() throws IOException { if (!initialized) { init(); } @@ -381,7 +381,7 @@ * @return Returns a byte[] containing the data in user-log. * @throws IOException */ - public byte[] fetchAll() throws IOException { + public synchronized byte[] fetchAll() throws IOException { if (!initialized) { init(); }