Return-Path: 
 <hdfs-commits-return-871-apmail-hadoop-hdfs-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org
Received: (qmail 25793 invoked from network); 5 Oct 2010 19:43:10 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 5 Oct 2010 19:43:10 -0000
Received: (qmail 11470 invoked by uid 500); 5 Oct 2010 19:43:10 -0000
Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org
Received: (qmail 11410 invoked by uid 500); 5 Oct 2010 19:43:09 -0000
Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:hdfs-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:hdfs-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:hdfs-commits@hadoop.apache.org>
List-Id: <hdfs-commits.hadoop.apache.org>
Reply-To: hdfs-dev@hadoop.apache.org
Delivered-To: mailing list hdfs-commits@hadoop.apache.org
Received: (qmail 11383 invoked by uid 99); 5 Oct 2010 19:43:09 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Oct 2010 19:43:09 +0000
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; Tue, 05 Oct 2010 19:43:08 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8730623888D2; Tue,  5 Oct 2010 19:42:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1004789 - in /hadoop/hdfs/branches/HDFS-1052: ./
 src/c++/libhdfs/ src/contrib/hdfsproxy/ src/java/ src/test/hdfs/
 src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/ src/webapps/datanode/
 src/webapps/hdfs/ src/webapps/secondary/
Date: Tue, 05 Oct 2010 19:42:48 -0000
To: hdfs-commits@hadoop.apache.org
From: suresh@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101005194248.8730623888D2@eris.apache.org>

Author: suresh
Date: Tue Oct  5 19:42:47 2010
New Revision: 1004789

URL: http://svn.apache.org/viewvc?rev=1004789&view=rev
Log:
Merging changes from the trunk to HDFS-1052 branch.

Modified:
    hadoop/hdfs/branches/HDFS-1052/   (props changed)
    hadoop/hdfs/branches/HDFS-1052/CHANGES.txt
    hadoop/hdfs/branches/HDFS-1052/build.xml   (props changed)
    hadoop/hdfs/branches/HDFS-1052/src/c++/libhdfs/   (props changed)
    hadoop/hdfs/branches/HDFS-1052/src/contrib/hdfsproxy/   (props changed)
    hadoop/hdfs/branches/HDFS-1052/src/java/   (props changed)
    hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/   (props changed)
    hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestComputeInvalidateWork.java
    hadoop/hdfs/branches/HDFS-1052/src/webapps/datanode/   (props changed)
    hadoop/hdfs/branches/HDFS-1052/src/webapps/hdfs/   (props changed)
    hadoop/hdfs/branches/HDFS-1052/src/webapps/secondary/   (props changed)

Propchange: hadoop/hdfs/branches/HDFS-1052/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  5 19:42:47 2010
@@ -1,4 +1,4 @@
 /hadoop/core/branches/branch-0.19/hdfs:713112
 /hadoop/hdfs/branches/HDFS-265:796829-820463
 /hadoop/hdfs/branches/branch-0.21:820487
-/hadoop/hdfs/trunk:987665-1004494
+/hadoop/hdfs/trunk:987665-1004788

Modified: hadoop/hdfs/branches/HDFS-1052/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/CHANGES.txt?rev=1004789&r1=1004788&r2=1004789&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/CHANGES.txt (original)
+++ hadoop/hdfs/branches/HDFS-1052/CHANGES.txt Tue Oct  5 19:42:47 2010
@@ -304,9 +304,13 @@ Trunk (unreleased changes)
     HDFS-1364. Makes long running HFTP-based applications do relogins
     if necessary. (Jitendra Pandey via ddas)
 
-    HDFS-1399.  Distinct minicluster services (e.g. NN and JT) overwrite each
+    HDFS-1399. Distinct minicluster services (e.g. NN and JT) overwrite each
     other's service policies.  (Aaron T. Myers via tomwhite)
 
+    HDFS-1440. Fix TestComputeInvalidateWork failure. (suresh)
+
+Release 0.21.0 - Unreleased
+
   INCOMPATIBLE CHANGES
 
     HDFS-538. Per the contract elucidated in HADOOP-6201, throw

Propchange: hadoop/hdfs/branches/HDFS-1052/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  5 19:42:47 2010
@@ -2,4 +2,4 @@
 /hadoop/core/trunk/build.xml:779102
 /hadoop/hdfs/branches/HDFS-265/build.xml:796829-820463
 /hadoop/hdfs/branches/branch-0.21/build.xml:820487
-/hadoop/hdfs/trunk/build.xml:987665-1004494
+/hadoop/hdfs/trunk/build.xml:987665-1004788

Propchange: hadoop/hdfs/branches/HDFS-1052/src/c++/libhdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  5 19:42:47 2010
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/c++/libhdfs:713112
 /hadoop/core/trunk/src/c++/libhdfs:776175-784663
-/hadoop/hdfs/trunk/src/c++/libhdfs:987665-1004494
+/hadoop/hdfs/trunk/src/c++/libhdfs:987665-1004788

Propchange: hadoop/hdfs/branches/HDFS-1052/src/contrib/hdfsproxy/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  5 19:42:47 2010
@@ -2,4 +2,4 @@
 /hadoop/core/trunk/src/contrib/hdfsproxy:776175-784663
 /hadoop/hdfs/branches/HDFS-265/src/contrib/hdfsproxy:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy:820487
-/hadoop/hdfs/trunk/src/contrib/hdfsproxy:987665-1004494
+/hadoop/hdfs/trunk/src/contrib/hdfsproxy:987665-1004788

Propchange: hadoop/hdfs/branches/HDFS-1052/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  5 19:42:47 2010
@@ -2,4 +2,4 @@
 /hadoop/core/trunk/src/hdfs:776175-785643,785929-786278
 /hadoop/hdfs/branches/HDFS-265/src/java:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/java:820487
-/hadoop/hdfs/trunk/src/java:987665-1004494
+/hadoop/hdfs/trunk/src/java:987665-1004788

Propchange: hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  5 19:42:47 2010
@@ -2,4 +2,4 @@
 /hadoop/core/trunk/src/test/hdfs:776175-785643
 /hadoop/hdfs/branches/HDFS-265/src/test/hdfs:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/test/hdfs:820487
-/hadoop/hdfs/trunk/src/test/hdfs:987665-1004494
+/hadoop/hdfs/trunk/src/test/hdfs:987665-1004788

Modified: hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestComputeInvalidateWork.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestComputeInvalidateWork.java?rev=1004789&r1=1004788&r2=1004789&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestComputeInvalidateWork.java (original)
+++ hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestComputeInvalidateWork.java Tue Oct  5 19:42:47 2010
@@ -44,29 +44,32 @@ public class TestComputeInvalidateWork e
         namesystem.heartbeats.toArray(new DatanodeDescriptor[NUM_OF_DATANODES]);
       assertEquals(nodes.length, NUM_OF_DATANODES);
       
-      synchronized (namesystem) {
-      for (int i=0; i<nodes.length; i++) {
-        for(int j=0; j<3*namesystem.blockInvalidateLimit+1; j++) {
-          Block block = new Block(i*(namesystem.blockInvalidateLimit+1)+j, 0, 
-              GenerationStamp.FIRST_VALID_STAMP);
-          namesystem.blockManager.addToInvalidates(block, nodes[i]);
+      namesystem.writeLock();
+      try {
+        for (int i=0; i<nodes.length; i++) {
+          for(int j=0; j<3*namesystem.blockInvalidateLimit+1; j++) {
+            Block block = new Block(i*(namesystem.blockInvalidateLimit+1)+j, 0, 
+                GenerationStamp.FIRST_VALID_STAMP);
+            namesystem.blockManager.addToInvalidates(block, nodes[i]);
+          }
         }
-      }
-      
-      assertEquals(namesystem.blockInvalidateLimit*NUM_OF_DATANODES, 
-          namesystem.blockManager.computeInvalidateWork(NUM_OF_DATANODES+1));
-      assertEquals(namesystem.blockInvalidateLimit*NUM_OF_DATANODES, 
-          namesystem.blockManager.computeInvalidateWork(NUM_OF_DATANODES));
-      assertEquals(namesystem.blockInvalidateLimit*(NUM_OF_DATANODES-1), 
-          namesystem.blockManager.computeInvalidateWork(NUM_OF_DATANODES-1));
-      int workCount = namesystem.blockManager.computeInvalidateWork(1);
-      if (workCount == 1) {
-        assertEquals(namesystem.blockInvalidateLimit+1, 
-            namesystem.blockManager.computeInvalidateWork(2));
-      } else {
-        assertEquals(workCount, namesystem.blockInvalidateLimit);
-        assertEquals(2, namesystem.blockManager.computeInvalidateWork(2));
-      }
+        
+        assertEquals(namesystem.blockInvalidateLimit*NUM_OF_DATANODES, 
+            namesystem.blockManager.computeInvalidateWork(NUM_OF_DATANODES+1));
+        assertEquals(namesystem.blockInvalidateLimit*NUM_OF_DATANODES, 
+            namesystem.blockManager.computeInvalidateWork(NUM_OF_DATANODES));
+        assertEquals(namesystem.blockInvalidateLimit*(NUM_OF_DATANODES-1), 
+            namesystem.blockManager.computeInvalidateWork(NUM_OF_DATANODES-1));
+        int workCount = namesystem.blockManager.computeInvalidateWork(1);
+        if (workCount == 1) {
+          assertEquals(namesystem.blockInvalidateLimit+1, 
+              namesystem.blockManager.computeInvalidateWork(2));
+        } else {
+          assertEquals(workCount, namesystem.blockInvalidateLimit);
+          assertEquals(2, namesystem.blockManager.computeInvalidateWork(2));
+        }
+      } finally {
+        namesystem.writeUnlock();
       }
     } finally {
       cluster.shutdown();

Propchange: hadoop/hdfs/branches/HDFS-1052/src/webapps/datanode/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  5 19:42:47 2010
@@ -2,4 +2,4 @@
 /hadoop/core/trunk/src/webapps/datanode:776175-784663
 /hadoop/hdfs/branches/HDFS-265/src/webapps/datanode:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/webapps/datanode:820487
-/hadoop/hdfs/trunk/src/webapps/datanode:987665-1004494
+/hadoop/hdfs/trunk/src/webapps/datanode:987665-1004788

Propchange: hadoop/hdfs/branches/HDFS-1052/src/webapps/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  5 19:42:47 2010
@@ -2,4 +2,4 @@
 /hadoop/core/trunk/src/webapps/hdfs:776175-784663
 /hadoop/hdfs/branches/HDFS-265/src/webapps/hdfs:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/webapps/hdfs:820487
-/hadoop/hdfs/trunk/src/webapps/hdfs:987665-1004494
+/hadoop/hdfs/trunk/src/webapps/hdfs:987665-1004788

Propchange: hadoop/hdfs/branches/HDFS-1052/src/webapps/secondary/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  5 19:42:47 2010
@@ -2,4 +2,4 @@
 /hadoop/core/trunk/src/webapps/secondary:776175-784663
 /hadoop/hdfs/branches/HDFS-265/src/webapps/secondary:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/webapps/secondary:820487
-/hadoop/hdfs/trunk/src/webapps/secondary:987665-1004494
+/hadoop/hdfs/trunk/src/webapps/secondary:987665-1004788