Return-Path: Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: (qmail 47739 invoked from network); 24 Apr 2010 21:31:38 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 24 Apr 2010 21:31:38 -0000 Received: (qmail 5281 invoked by uid 500); 24 Apr 2010 21:31:38 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 5257 invoked by uid 500); 24 Apr 2010 21:31:38 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 5249 invoked by uid 99); 24 Apr 2010 21:31:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Apr 2010 21:31:38 +0000 X-ASF-Spam-Status: No, hits=-1201.0 required=10.0 tests=ALL_TRUSTED,AWL 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; Sat, 24 Apr 2010 21:31:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9F54D23889FA; Sat, 24 Apr 2010 21:30:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r937705 - in /hadoop/hdfs/trunk: CHANGES.txt src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDiskError.java Date: Sat, 24 Apr 2010 21:30:55 -0000 To: hdfs-commits@hadoop.apache.org From: jghoman@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100424213055.9F54D23889FA@eris.apache.org> Author: jghoman Date: Sat Apr 24 21:30:55 2010 New Revision: 937705 URL: http://svn.apache.org/viewvc?rev=937705&view=rev Log: HDFS-1101. TestDiskError.testLocalDirs() fails. (cdouglas via jghoman) Modified: hadoop/hdfs/trunk/CHANGES.txt hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDiskError.java Modified: hadoop/hdfs/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=937705&r1=937704&r2=937705&view=diff ============================================================================== --- hadoop/hdfs/trunk/CHANGES.txt (original) +++ hadoop/hdfs/trunk/CHANGES.txt Sat Apr 24 21:30:55 2010 @@ -284,6 +284,8 @@ Trunk (unreleased changes) HDFS-833. Datanode shutdown should log problems with Storage.unlockAll() (Steve Loughran via dhruba) + HDFS-1101. TestDiskError.testLocalDirs() fails. (cdouglas via jghoman) + Release 0.21.0 - Unreleased INCOMPATIBLE CHANGES Modified: hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDiskError.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDiskError.java?rev=937705&r1=937704&r2=937705&view=diff ============================================================================== --- hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDiskError.java (original) +++ hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDiskError.java Sat Apr 24 21:30:55 2010 @@ -166,13 +166,16 @@ public class TestDiskError extends TestC // Check permissions on directories in 'dfs.data.dir' FileSystem localFS = FileSystem.getLocal(conf); - String[] dataDirs = conf.getStrings(DFSConfigKeys.DFS_DATANODE_DATA_DIR_KEY); - for (String dir : dataDirs) { - Path dataDir = new Path(dir); - FsPermission actual = localFS.getFileStatus(dataDir).getPermission(); - assertEquals("Permission for dir: " + dataDir + ", is " + actual + - ", while expected is " + expected, - expected, actual); + for (DataNode dn : cluster.getDataNodes()) { + String[] dataDirs = + dn.getConf().getStrings(DFSConfigKeys.DFS_DATANODE_DATA_DIR_KEY); + for (String dir : dataDirs) { + Path dataDir = new Path(dir); + FsPermission actual = localFS.getFileStatus(dataDir).getPermission(); + assertEquals("Permission for dir: " + dataDir + ", is " + actual + + ", while expected is " + expected, + expected, actual); + } } } finally { if (cluster != null)