From 72d6eac00e2cc2ab078b35c6dbfb91e2c6c3503c Mon Sep 17 00:00:00 2001 From: chungen0126 Date: Mon, 26 Aug 2024 00:52:41 +0800 Subject: [PATCH 1/7] HDDS-11359. Intermittent timeout in TestPipelineManagerMXBean#testPipelineInfo --- .../hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java index 75d860d951be..0f493e8157cd 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java @@ -85,7 +85,7 @@ public void testPipelineInfo() throws Exception { } catch (Exception e) { throw new RuntimeException(e); } - }, 500, 3000); + }, 500, 12000); } private Integer getMetricsCount(TabularData data, String state) { From 4fa4d52e50613df8a6a978a367795889bba99f73 Mon Sep 17 00:00:00 2001 From: chungen0126 Date: Tue, 27 Aug 2024 18:07:34 +0800 Subject: [PATCH 2/7] log error --- .../hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java index 0f493e8157cd..8fd232eafcab 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java @@ -26,6 +26,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.management.MBeanServer; import javax.management.ObjectName; @@ -45,6 +47,8 @@ @Timeout(3000) public class TestPipelineManagerMXBean { + private static final Logger LOG = + LoggerFactory.getLogger(TestPipelineManagerMXBean.class); private MiniOzoneCluster cluster; private MBeanServer mbs; @@ -78,6 +82,8 @@ public void testPipelineInfo() throws Exception { final Integer count = entry.getValue(); final Integer currentCount = getMetricsCount(data, entry.getKey()); if (currentCount == null || !currentCount.equals(count)) { + LOG.error("PipelineState = {}: [currentCount = {}, PipelineCount = {}]", + entry.getKey(), currentCount, count); return false; } } From a1188ea46a1e3882a83ab28e03993974f9c63ea8 Mon Sep 17 00:00:00 2001 From: chungen0126 Date: Wed, 28 Aug 2024 06:44:44 +0800 Subject: [PATCH 3/7] HDDS-11359. Intermittent timeout in TestPipelineManagerMXBean#testPipelineInfo --- .../hdds/scm/pipeline/TestPipelineManagerMXBean.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java index 8fd232eafcab..0a2e460ac1c8 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java @@ -22,6 +22,7 @@ import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.ozone.test.GenericTestUtils; import org.apache.ozone.test.tag.Flaky; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -38,6 +39,7 @@ import java.util.Map; import java.util.concurrent.TimeoutException; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -71,19 +73,17 @@ public void init() public void testPipelineInfo() throws Exception { ObjectName bean = new ObjectName( "Hadoop:service=SCMPipelineManager,name=SCMPipelineManagerInfo"); - Map pipelineStateCount = cluster - .getStorageContainerManager().getPipelineManager().getPipelineInfo(); GenericTestUtils.waitFor(() -> { try { + Map pipelineStateCount = cluster + .getStorageContainerManager().getPipelineManager().getPipelineInfo(); final TabularData data = (TabularData) mbs.getAttribute( bean, "PipelineInfo"); for (Map.Entry entry : pipelineStateCount.entrySet()) { final Integer count = entry.getValue(); final Integer currentCount = getMetricsCount(data, entry.getKey()); if (currentCount == null || !currentCount.equals(count)) { - LOG.error("PipelineState = {}: [currentCount = {}, PipelineCount = {}]", - entry.getKey(), currentCount, count); return false; } } @@ -91,7 +91,7 @@ public void testPipelineInfo() throws Exception { } catch (Exception e) { throw new RuntimeException(e); } - }, 500, 12000); + }, 500, 3000); } private Integer getMetricsCount(TabularData data, String state) { From af6a516375eeeb895d646c6b66acb799497663a0 Mon Sep 17 00:00:00 2001 From: chungen0126 Date: Thu, 29 Aug 2024 12:09:04 +0800 Subject: [PATCH 4/7] fix checkstyle and remove tag --- .../hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java index 0a2e460ac1c8..2d7717cb1d58 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java @@ -22,7 +22,6 @@ import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.ozone.test.GenericTestUtils; import org.apache.ozone.test.tag.Flaky; -import org.apache.ratis.protocol.exceptions.NotLeaderException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -39,7 +38,6 @@ import java.util.Map; import java.util.concurrent.TimeoutException; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -68,7 +66,6 @@ public void init() * * @throws Exception */ - @Flaky("HDDS-11359") @Test public void testPipelineInfo() throws Exception { ObjectName bean = new ObjectName( From 482e374f8e5d5dc730b02cd559c37687def2c3a1 Mon Sep 17 00:00:00 2001 From: chungen0126 Date: Thu, 29 Aug 2024 12:16:43 +0800 Subject: [PATCH 5/7] clean up unused code --- .../hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java index 2d7717cb1d58..60618281de60 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java @@ -21,7 +21,6 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.ozone.test.GenericTestUtils; -import org.apache.ozone.test.tag.Flaky; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -47,8 +46,6 @@ @Timeout(3000) public class TestPipelineManagerMXBean { - private static final Logger LOG = - LoggerFactory.getLogger(TestPipelineManagerMXBean.class); private MiniOzoneCluster cluster; private MBeanServer mbs; From 17545a3cc80bd046511a8e2473b07a6d4d526bc6 Mon Sep 17 00:00:00 2001 From: chungen0126 Date: Thu, 29 Aug 2024 12:17:11 +0800 Subject: [PATCH 6/7] clean up unused code --- .../hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java index 60618281de60..31bdae55b0ad 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java @@ -25,8 +25,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import javax.management.MBeanServer; import javax.management.ObjectName; From 66563561c6a645a45e5681277abaf338d021c5b2 Mon Sep 17 00:00:00 2001 From: chungen0126 Date: Thu, 29 Aug 2024 15:28:46 +0800 Subject: [PATCH 7/7] fix checkstyle --- .../hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java index 31bdae55b0ad..4a9efceeb7b8 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java @@ -69,7 +69,7 @@ public void testPipelineInfo() throws Exception { GenericTestUtils.waitFor(() -> { try { Map pipelineStateCount = cluster - .getStorageContainerManager().getPipelineManager().getPipelineInfo(); + .getStorageContainerManager().getPipelineManager().getPipelineInfo(); final TabularData data = (TabularData) mbs.getAttribute( bean, "PipelineInfo"); for (Map.Entry entry : pipelineStateCount.entrySet()) {