You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by el...@apache.org on 2010/11/19 08:21:12 UTC
svn commit: r1036751 - in /hadoop/hdfs/branches/branch-0.22: CHANGES.txt
src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
src/test/hdfs/org/apache/hadoop/hdfs/TestPipelines.java
Author: eli
Date: Fri Nov 19 07:21:12 2010
New Revision: 1036751
URL: http://svn.apache.org/viewvc?rev=1036751&view=rev
Log:
Revert HDFS-1467, causing test timeouts.
Modified:
hadoop/hdfs/branches/branch-0.22/CHANGES.txt
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/TestPipelines.java
Modified: hadoop/hdfs/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/CHANGES.txt?rev=1036751&r1=1036750&r2=1036751&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.22/CHANGES.txt Fri Nov 19 07:21:12 2010
@@ -60,7 +60,6 @@ Release 0.22.0 - Unreleased
HDFS-1096. fix for prev. commit. (boryas)
-
HDFS-1096. allow dfsadmin/mradmin refresh of superuser proxy group
mappings (boryas)
@@ -210,9 +209,6 @@ Release 0.22.0 - Unreleased
HDFS-1500. TestOfflineImageViewer failing on trunk. (Todd Lipcon
via hairong)
- HDFS-1467. Append pipeline construction not succeeds with more than
- one replica. (Todd Lipcon via hairong)
-
HDFS-1483. DFSClient.getBlockLocations should indicate if corresponding
blocks are corrupt. (Patrick Kling via hairong)
Modified: hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java?rev=1036751&r1=1036750&r2=1036751&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java (original)
+++ hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java Fri Nov 19 07:21:12 2010
@@ -82,13 +82,13 @@ class BlockReceiver implements java.io.C
final private ReplicaInPipelineInterface replicaInfo;
volatile private boolean mirrorError;
- BlockReceiver(Block inBlock, DataInputStream in, String inAddr,
+ BlockReceiver(Block block, DataInputStream in, String inAddr,
String myAddr, BlockConstructionStage stage,
long newGs, long minBytesRcvd, long maxBytesRcvd,
String clientName, DatanodeInfo srcDataNode, DataNode datanode)
throws IOException {
try{
- this.block = new Block(inBlock);
+ this.block = block;
this.in = in;
this.inAddr = inAddr;
this.myAddr = myAddr;
Modified: hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/TestPipelines.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/TestPipelines.java?rev=1036751&r1=1036750&r2=1036751&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/TestPipelines.java (original)
+++ hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/TestPipelines.java Fri Nov 19 07:21:12 2010
@@ -103,16 +103,12 @@ public class TestPipelines {
List<LocatedBlock> lb = cluster.getNameNode().getBlockLocations(
filePath.toString(), FILE_SIZE - 1, FILE_SIZE).getLocatedBlocks();
- for (DataNode dn : cluster.getDataNodes()) {
- Replica r = DataNodeAdapter.fetchReplicaInfo(
- dn, lb.get(0).getBlock().getBlockId());
-
- assertTrue("Replica on DN " + dn + " shouldn't be null", r != null);
- assertEquals(
- "Should be RBW replica on " + dn + " after sequence of calls " +
- "append()/write()/hflush()",
- HdfsConstants.ReplicaState.RBW, r.getState());
- }
+ Replica r = DataNodeAdapter.fetchReplicaInfo(cluster.getDataNodes().get(0),
+ lb.get(0).getBlock().getBlockId());
+ assertTrue("Replica shouldn'e be null", r != null);
+ assertEquals(
+ "Should be RBW replica after sequence of calls append()/write()/hflush()",
+ HdfsConstants.ReplicaState.RBW, r.getState());
ofs.close();
}