Repository: hadoop Updated Branches: refs/heads/branch-3.1 c73f34fea -> b01f8fd2b
HDFS-12156. TestFSImage fails without -Pnative (cherry picked from commit 319defafc105c0d0b69b83828b578d9c453036f5) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b01f8fd2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b01f8fd2 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b01f8fd2 Branch: refs/heads/branch-3.1 Commit: b01f8fd2bc7318ea6328d7b6a49f520448054837 Parents: c73f34f Author: Akira Ajisaka <aajis...@apache.org> Authored: Tue Mar 13 11:26:48 2018 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Tue Mar 13 11:27:28 2018 +0900 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/server/namenode/TestFSImage.java | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b01f8fd2/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 38a6dab..ba08f73 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 @@ -48,6 +48,7 @@ import org.apache.hadoop.hdfs.protocol.BlockType; import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.StartupOption; import org.apache.hadoop.io.erasurecode.ECSchema; import org.apache.hadoop.ipc.RemoteException; +import org.apache.hadoop.util.NativeCodeLoader; import org.junit.Assert; import org.apache.hadoop.fs.permission.PermissionStatus; @@ -74,6 +75,7 @@ import org.apache.hadoop.hdfs.util.MD5FileUtils; import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.test.PathUtils; import org.apache.hadoop.util.Time; +import org.junit.Assume; import org.junit.Test; import static org.junit.Assert.assertArrayEquals; @@ -99,6 +101,13 @@ public class TestFSImage { setCompressCodec(conf, "org.apache.hadoop.io.compress.DefaultCodec"); setCompressCodec(conf, "org.apache.hadoop.io.compress.GzipCodec"); setCompressCodec(conf, "org.apache.hadoop.io.compress.BZip2Codec"); + } + + @Test + public void testNativeCompression() throws IOException { + Assume.assumeTrue(NativeCodeLoader.isNativeCodeLoaded()); + Configuration conf = new Configuration(); + conf.setBoolean(DFSConfigKeys.DFS_IMAGE_COMPRESS_KEY, true); setCompressCodec(conf, "org.apache.hadoop.io.compress.Lz4Codec"); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
