[prev in list] [next in list] [prev in thread] [next in thread] 

List:       hadoop-commits
Subject:    hadoop git commit: HDFS-12156. TestFSImage fails without -Pnative
From:       weichiu () apache ! org
Date:       2018-04-30 17:28:36
Message-ID: 050741c5f675428eb175df1122cab349 () git ! apache ! org
[Download RAW message or body]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 112041d3f -> 20c6b448a


HDFS-12156. TestFSImage fails without -Pnative

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

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSImage.java



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

Branch: refs/heads/branch-2.7
Commit: 20c6b448ac34841c24cdb2ca5e7d7414148ceedd
Parents: 112041d
Author: Akira Ajisaka <aajisaka@apache.org>
Authored: Tue Mar 13 11:26:48 2018 +0900
Committer: Wei-Chiu Chuang <weichiu@apache.org>
Committed: Mon Apr 30 10:28:09 2018 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hdfs/server/namenode/TestFSImage.java | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/20c6b448/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 29116ba..d3d039e 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
 @@ -25,6 +25,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;
@@ -46,6 +47,7 @@ import org.apache.hadoop.hdfs.server.namenode.LeaseManager.Lease;
 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.junit.Test;
 
 public class TestFSImage {
@@ -65,6 +67,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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


[prev in list] [next in list] [prev in thread] [next in thread]