hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sc...@apache.org
Subject svn commit: r1032876 - in /hadoop/mapreduce/trunk: CHANGES.txt src/contrib/raid/src/java/org/apache/hadoop/hdfs/server/datanode/RaidBlockSender.java src/contrib/raid/src/java/org/apache/hadoop/raid/BlockFixer.java
Date Tue, 09 Nov 2010 07:31:13 GMT
Author: schen
Date: Tue Nov  9 07:31:12 2010
New Revision: 1032876

URL: http://svn.apache.org/viewvc?rev=1032876&view=rev
Log:
MAPREDUCE-2179. Fix RaidBlockSender compilation failure. (Ramkumar Vadali via
schen)

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/hdfs/server/datanode/RaidBlockSender.java
    hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockFixer.java

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1032876&r1=1032875&r2=1032876&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Tue Nov  9 07:31:12 2010
@@ -380,6 +380,9 @@ Trunk (unreleased changes)
     MAPREDUCE-2142.  Refactor RaidNode so that the map-reduce component is
     clearly separated out. (Patrick Kling via dhruba)
 
+    MAPREDUCE-2179. Fix RaidBlockSender compilation failure. (Ramkumar Vadali
+    via schen)
+
 Release 0.21.1 - Unreleased
 
   NEW FEATURES

Modified: hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/hdfs/server/datanode/RaidBlockSender.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/hdfs/server/datanode/RaidBlockSender.java?rev=1032876&r1=1032875&r2=1032876&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/hdfs/server/datanode/RaidBlockSender.java
(original)
+++ hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/hdfs/server/datanode/RaidBlockSender.java
Tue Nov  9 07:31:12 2010
@@ -68,7 +68,6 @@ public class RaidBlockSender implements 
   private boolean transferToAllowed = true;
   private boolean blockReadFully; //set when the whole block is read
   private boolean verifyChecksum; //if true, check is verified while reading
-  private BlockTransferThrottler throttler;
   private final String clientTraceFmt; // format of client trace log message
 
   /**
@@ -353,10 +352,6 @@ public class RaidBlockSender implements 
       throw ioeToSocketException(e);
     }
 
-    if (throttler != null) { // rebalancing so throttle
-      throttler.throttle(packetLen);
-    }
-
     return len;
   }
 
@@ -370,15 +365,13 @@ public class RaidBlockSender implements 
    *        sending the data, e.g. 
    *        {@link SocketOutputStream#transferToFully(FileChannel, 
    *        long, int)}.
-   * @param throttler for sending data.
    * @return total bytes reads, including crc.
    */
-  public long sendBlock(DataOutputStream out, OutputStream baseStream, 
-                 BlockTransferThrottler throttler) throws IOException {
+  public long sendBlock(DataOutputStream out, OutputStream baseStream)
+      throws IOException {
     if( out == null ) {
       throw new IOException( "out stream is null" );
     }
-    this.throttler = throttler;
 
     long initialOffset = offset;
     long totalRead = 0;

Modified: hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockFixer.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockFixer.java?rev=1032876&r1=1032875&r2=1032876&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockFixer.java
(original)
+++ hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockFixer.java
Tue Nov  9 07:31:12 2010
@@ -677,7 +677,7 @@ public class BlockFixer implements Runna
         out, block.getBlock(), 1,
         DataTransferProtocol.BlockConstructionStage.PIPELINE_SETUP_CREATE,
         0, blockSize, 0, "", null, nodes, block.getBlockToken());
-      blockSender.sendBlock(out, baseStream, null);
+      blockSender.sendBlock(out, baseStream);
 
       LOG.info("Sent block " + block.getBlock() + " to " + datanode.name);
     } finally {



Mime
View raw message