You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xg...@apache.org on 2016/12/21 22:42:30 UTC
[06/17] hadoop git commit: HDFS-11263. ClassCastException when we use
Bzipcodec for Fsimage compression. Contributed by Brahma Reddy Battula.
HDFS-11263. ClassCastException when we use Bzipcodec for Fsimage compression. Contributed by Brahma Reddy Battula.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1b401f6a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1b401f6a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1b401f6a
Branch: refs/heads/YARN-5734
Commit: 1b401f6a734df4e23a79b3bd89c816a1fc0de574
Parents: fe4ff64
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Tue Dec 20 20:54:03 2016 +0530
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Tue Dec 20 20:54:03 2016 +0530
----------------------------------------------------------------------
.../hdfs/server/namenode/FSImageFormatProtobuf.java | 4 ++--
.../apache/hadoop/hdfs/server/namenode/TestFSImage.java | 12 +++++++++---
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1b401f6a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatProtobuf.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatProtobuf.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatProtobuf.java
index 7a81f9e..22331fe 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatProtobuf.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatProtobuf.java
@@ -40,6 +40,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import org.apache.hadoop.io.compress.CompressionOutputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience;
@@ -63,7 +64,6 @@ import org.apache.hadoop.hdfs.server.namenode.startupprogress.StepType;
import org.apache.hadoop.hdfs.util.MD5FileUtils;
import org.apache.hadoop.io.MD5Hash;
import org.apache.hadoop.io.compress.CompressionCodec;
-import org.apache.hadoop.io.compress.CompressorStream;
import org.apache.hadoop.util.LimitInputStream;
import org.apache.hadoop.util.Time;
@@ -417,7 +417,7 @@ public final class FSImageFormatProtobuf {
private void flushSectionOutputStream() throws IOException {
if (codec != null) {
- ((CompressorStream) sectionOutputStream).finish();
+ ((CompressionOutputStream) sectionOutputStream).finish();
}
sectionOutputStream.flush();
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1b401f6a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSImage.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSImage.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSImage.java
index 0d8431d..f839270 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSImage.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSImage.java
@@ -52,7 +52,6 @@ import org.apache.hadoop.hdfs.DFSTestUtil;
import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.hdfs.HdfsConfiguration;
import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.hadoop.hdfs.StripedFileTestUtil;
import org.apache.hadoop.hdfs.client.HdfsDataOutputStream.SyncFlag;
import org.apache.hadoop.hdfs.protocol.HdfsConstants;
import org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction;
@@ -84,8 +83,15 @@ public class TestFSImage {
public void testCompression() throws IOException {
Configuration conf = new Configuration();
conf.setBoolean(DFSConfigKeys.DFS_IMAGE_COMPRESS_KEY, true);
- conf.set(DFSConfigKeys.DFS_IMAGE_COMPRESSION_CODEC_KEY,
- "org.apache.hadoop.io.compress.GzipCodec");
+ setCompressCodec(conf, "org.apache.hadoop.io.compress.DefaultCodec");
+ setCompressCodec(conf, "org.apache.hadoop.io.compress.GzipCodec");
+ setCompressCodec(conf, "org.apache.hadoop.io.compress.BZip2Codec");
+ setCompressCodec(conf, "org.apache.hadoop.io.compress.Lz4Codec");
+ }
+
+ private void setCompressCodec(Configuration conf, String compressCodec)
+ throws IOException {
+ conf.set(DFSConfigKeys.DFS_IMAGE_COMPRESSION_CODEC_KEY, compressCodec);
testPersistHelper(conf);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org