Return-Path: X-Original-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 957DB6380 for ; Sat, 21 May 2011 00:55:18 +0000 (UTC) Received: (qmail 6807 invoked by uid 500); 21 May 2011 00:55:18 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 6789 invoked by uid 500); 21 May 2011 00:55:18 -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 6781 invoked by uid 99); 21 May 2011 00:55:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 May 2011 00:55:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Sat, 21 May 2011 00:55:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 003F32388993; Sat, 21 May 2011 00:54:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1125607 - in /hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs: DFSTestUtil.java server/datanode/SimulatedFSDataset.java server/datanode/TestTransferRbw.java Date: Sat, 21 May 2011 00:54:53 -0000 To: hdfs-commits@hadoop.apache.org From: szetszwo@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110521005454.003F32388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: szetszwo Date: Sat May 21 00:54:53 2011 New Revision: 1125607 URL: http://svn.apache.org/viewvc?rev=1125607&view=rev Log: Fix test compilation for some of the previous commits. Modified: hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/DFSTestUtil.java hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestTransferRbw.java Modified: hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/DFSTestUtil.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/DFSTestUtil.java?rev=1125607&r1=1125606&r2=1125607&view=diff ============================================================================== --- hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/DFSTestUtil.java (original) +++ hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/DFSTestUtil.java Sat May 21 00:54:53 2011 @@ -400,7 +400,7 @@ public class DFSTestUtil { } /** For {@link TestTransferRbw} */ - public static DataTransferProtocol.Status transferRbw(final Block b, + public static DataTransferProtocol.Status transferRbw(final ExtendedBlock b, final DFSClient dfsClient, final DatanodeInfo... datanodes) throws IOException { Assert.assertEquals(2, datanodes.length); final Socket s = DFSOutputStream.createSocketForPipeline(datanodes, dfsClient); Modified: hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java?rev=1125607&r1=1125606&r2=1125607&view=diff ============================================================================== --- hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java (original) +++ hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java Sat May 21 00:54:53 2011 @@ -550,7 +550,7 @@ public class SimulatedFSDataset impleme } @Override - public synchronized boolean isValidRbw(Block b) { + public synchronized boolean isValidRbw(ExtendedBlock b) { final Map map = blockMap.get(b.getBlockPoolId()); if (map == null) { return false; @@ -960,9 +960,13 @@ public class SimulatedFSDataset impleme } @Override - public ReplicaInPipelineInterface convertTemporaryToRbw(Block temporary) + public ReplicaInPipelineInterface convertTemporaryToRbw(ExtendedBlock temporary) throws IOException { - final BInfo r = blockMap.get(temporary); + final Map map = blockMap.get(temporary.getBlockPoolId()); + if (map == null) { + throw new IOException("Block pool not found, temporary=" + temporary); + } + final BInfo r = map.get(temporary.getLocalBlock()); if (r == null) { throw new IOException("Block not found, temporary=" + temporary); } else if (r.isFinalized()) { Modified: hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestTransferRbw.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestTransferRbw.java?rev=1125607&r1=1125606&r2=1125607&view=diff ============================================================================== --- hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestTransferRbw.java (original) +++ hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestTransferRbw.java Sat May 21 00:54:53 2011 @@ -32,8 +32,10 @@ import org.apache.hadoop.hdfs.MiniDFSClu import org.apache.hadoop.hdfs.protocol.Block; import org.apache.hadoop.hdfs.protocol.DataTransferProtocol; import org.apache.hadoop.hdfs.protocol.DatanodeInfo; +import org.apache.hadoop.hdfs.protocol.ExtendedBlock; import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType; import org.apache.hadoop.hdfs.server.common.HdfsConstants.ReplicaState; +import org.apache.hadoop.hdfs.server.protocol.DatanodeRegistration; import org.apache.log4j.Level; import org.junit.Assert; import org.junit.Test; @@ -49,14 +51,14 @@ public class TestTransferRbw { private static final Random RAN = new Random(); private static final short REPLICATION = (short)1; - private static ReplicaBeingWritten getRbw(final DataNode datanode - ) throws InterruptedException { - return (ReplicaBeingWritten)getReplica(datanode, ReplicaState.RBW); + private static ReplicaBeingWritten getRbw(final DataNode datanode, + String bpid) throws InterruptedException { + return (ReplicaBeingWritten)getReplica(datanode, bpid, ReplicaState.RBW); } private static ReplicaInPipeline getReplica(final DataNode datanode, - final ReplicaState expectedState) throws InterruptedException { + final String bpid, final ReplicaState expectedState) throws InterruptedException { final FSDataset dataset = ((FSDataset)datanode.data); - final Collection replicas = dataset.volumeMap.replicas(); + final Collection replicas = dataset.volumeMap.replicas(bpid); for(int i = 0; i < 5 && replicas.size() == 0; i++) { LOG.info("wait since replicas.size() == 0; i=" + i); Thread.sleep(1000); @@ -94,9 +96,10 @@ public class TestTransferRbw { final ReplicaBeingWritten oldrbw; final DataNode newnode; final DatanodeInfo newnodeinfo; + final String bpid = cluster.getNamesystem().getBlockPoolId(); { final DataNode oldnode = cluster.getDataNodes().get(0); - oldrbw = getRbw(oldnode); + oldrbw = getRbw(oldnode, bpid); LOG.info("oldrbw = " + oldrbw); //add a datanode @@ -109,15 +112,15 @@ public class TestTransferRbw { ).getDatanodeReport(DatanodeReportType.LIVE); Assert.assertEquals(2, datatnodeinfos.length); int i = 0; - for(; i < datatnodeinfos.length - && !datatnodeinfos[i].equals(newnode.dnRegistration); i++); + for(DatanodeRegistration dnReg = newnode.getDNRegistrationForBP(bpid); + i < datatnodeinfos.length && !datatnodeinfos[i].equals(dnReg); i++); Assert.assertTrue(i < datatnodeinfos.length); newnodeinfo = datatnodeinfos[i]; oldnodeinfo = datatnodeinfos[1 - i]; } //transfer RBW - final Block b = new Block(oldrbw.getBlockId(), oldrbw.getBytesAcked(), + final ExtendedBlock b = new ExtendedBlock(bpid, oldrbw.getBlockId(), oldrbw.getBytesAcked(), oldrbw.getGenerationStamp()); final DataTransferProtocol.Status s = DFSTestUtil.transferRbw( b, fs.getClient(), oldnodeinfo, newnodeinfo); @@ -125,7 +128,7 @@ public class TestTransferRbw { } //check new rbw - final ReplicaBeingWritten newrbw = getRbw(newnode); + final ReplicaBeingWritten newrbw = getRbw(newnode, bpid); LOG.info("newrbw = " + newrbw); Assert.assertEquals(oldrbw.getBlockId(), newrbw.getBlockId()); Assert.assertEquals(oldrbw.getGenerationStamp(), newrbw.getGenerationStamp());