Author: szetszwo
Date: Thu Jul 26 04:28:52 2012
New Revision: 1365881
URL: http://svn.apache.org/viewvc?rev=1365881&view=rev
Log:
HDFS-496. Backport: Use PureJavaCrc32 in HDFS. Contributed by Brandon Li
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1365881&r1=1365880&r2=1365881&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Thu Jul 26 04:28:52 2012
@@ -49,6 +49,8 @@ Release 1.2.0 - unreleased
HADOOP-8617. Backport HADOOP-6148, HADOOP-6166 and HADOOP-7333 for a pure
Java CRC32 calculator implementation. (Brandon Li via szetszwo)
+ HDFS-496. Backport: Use PureJavaCrc32 in HDFS. (Brandon Li via szetszwo)
+
BUG FIXES
HADOOP-8460. Document proper setting of HADOOP_PID_DIR and
Modified:
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java?rev=1365881&r1=1365880&r2=1365881&view=diff
==============================================================================
---
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
(original)
+++
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
Thu Jul 26 04:28:52 2012
@@ -54,7 +54,6 @@ import org.apache.commons.logging.*;
import java.io.*;
import java.net.*;
import java.util.*;
-import java.util.zip.CRC32;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.ConcurrentHashMap;
import java.nio.BufferOverflowException;
@@ -3393,7 +3392,7 @@ public class DFSClient implements FSCons
private DFSOutputStream(String src, long blockSize, Progressable progress,
int bytesPerChecksum, short replication) throws IOException {
- super(new CRC32(), bytesPerChecksum, 4);
+ super(new PureJavaCrc32(), bytesPerChecksum, 4);
this.src = src;
this.blockSize = blockSize;
this.blockReplication = replication;
Modified:
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java?rev=1365881&r1=1365880&r2=1365881&view=diff
==============================================================================
---
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
(original)
+++
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
Thu Jul 26 04:28:52 2012
@@ -27,7 +27,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.util.LinkedList;
-import java.util.zip.CRC32;
import java.util.zip.Checksum;
import org.apache.commons.logging.Log;
@@ -44,6 +43,7 @@ import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.io.nativeio.NativeIO;
import org.apache.hadoop.util.Daemon;
import org.apache.hadoop.util.DataChecksum;
+import org.apache.hadoop.util.PureJavaCrc32;
import org.apache.hadoop.util.StringUtils;
import static
org.apache.hadoop.hdfs.server.datanode.DataNode.DN_CLIENTTRACE_FORMAT;
@@ -719,7 +719,7 @@ class BlockReceiver implements java.io.C
}
// compute crc of partial chunk from data read in the block file.
- partialCrc = new CRC32();
+ partialCrc = new PureJavaCrc32();
partialCrc.update(buf, 0, sizePartialChunk);
LOG.info("Read in partial CRC chunk from disk for block " + block);
