Repository: hadoop
Updated Branches:
  refs/heads/branch-2.9 c767bcd1e -> f4bbd6c89


HDFS-12156. TestFSImage fails without -Pnative

(cherry picked from commit 319defafc105c0d0b69b83828b578d9c453036f5)
(cherry picked from commit b0c80f1c814827abf95316dc9c23701f8ef09d9a)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f4bbd6c8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f4bbd6c8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f4bbd6c8

Branch: refs/heads/branch-2.9
Commit: f4bbd6c893092861cdc4946867fc166b4a2bd9f3
Parents: c767bcd
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:30:13 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/f4bbd6c8/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 44f7afd..cbfc258 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
@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.util.EnumSet;
 
 import org.junit.Assert;
+import org.junit.Assume;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataOutputStream;
@@ -48,6 +49,7 @@ import 
org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
 import org.apache.hadoop.hdfs.util.MD5FileUtils;
 import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.test.PathUtils;
+import org.apache.hadoop.util.NativeCodeLoader;
 import org.apache.hadoop.util.Time;
 import org.junit.Test;
 
@@ -68,6 +70,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

Reply via email to