From 4df885190e73c58034e886bf1fa4573c2e113c08 Mon Sep 17 00:00:00 2001 From: Aryan Gupta Date: Tue, 22 Sep 2020 21:06:23 +0530 Subject: [PATCH 1/5] HDDS-3966. Enable TestOMRatisSnapshots. --- .../java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java index ef08abd89096..1465d95ce665 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java @@ -46,7 +46,6 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -57,7 +56,6 @@ /** * Tests the Ratis snaphsots feature in OM. */ -@Ignore("HDDS-3966") public class TestOMRatisSnapshots { private MiniOzoneHAClusterImpl cluster = null; From f93c603905baf789ffb1bd24401948bf868632b4 Mon Sep 17 00:00:00 2001 From: Aryan Gupta Date: Tue, 22 Sep 2020 21:13:34 +0530 Subject: [PATCH 2/5] HDDS-3297. Enable TestOzoneClientKeyGenerator. --- .../apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java index f2e23f5e155e..055f11413958 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java @@ -28,14 +28,12 @@ import org.apache.ratis.server.impl.RaftServerImpl; import org.apache.ratis.server.raftlog.RaftLog; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.slf4j.event.Level; /** * Test for OzoneClientKeyGenerator. */ -@Ignore("HDDS-3297") public class TestOzoneClientKeyGenerator { private String path; From 37b871616a88bec948dbc4d697534a4976b84c63 Mon Sep 17 00:00:00 2001 From: Aryan Gupta Date: Wed, 23 Sep 2020 21:01:14 +0530 Subject: [PATCH 3/5] HDDS-3297. Enable TestOzoneClientKeyGenerator. --- .../apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java | 1 - 1 file changed, 1 deletion(-) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java index 055f11413958..e46e02910112 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java @@ -23,7 +23,6 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.test.GenericTestUtils; - import org.apache.commons.io.FileUtils; import org.apache.ratis.server.impl.RaftServerImpl; import org.apache.ratis.server.raftlog.RaftLog; From 7a87053ed3ebcbcef6d2c0151bf8c0a4a2c855e1 Mon Sep 17 00:00:00 2001 From: Aryan Gupta Date: Wed, 23 Sep 2020 21:08:45 +0530 Subject: [PATCH 4/5] HDDS-3297. Enable TestOzoneClientKeyGenerator. --- .../apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java index e46e02910112..055f11413958 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.test.GenericTestUtils; + import org.apache.commons.io.FileUtils; import org.apache.ratis.server.impl.RaftServerImpl; import org.apache.ratis.server.raftlog.RaftLog; From c5c9d6853861607590e03ae3440e30941a9d1309 Mon Sep 17 00:00:00 2001 From: Aryan Gupta Date: Wed, 23 Sep 2020 21:14:16 +0530 Subject: [PATCH 5/5] HDDS-3297. Enable TestOzoneClientKeyGenerator. --- .../java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java index 1465d95ce665..ef08abd89096 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java @@ -46,6 +46,7 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -56,6 +57,7 @@ /** * Tests the Ratis snaphsots feature in OM. */ +@Ignore("HDDS-3966") public class TestOMRatisSnapshots { private MiniOzoneHAClusterImpl cluster = null;