From 47564bb47df6a52b5c86b5ce668f25a5a8922fe9 Mon Sep 17 00:00:00 2001
From: Chung En Lee <wfps1210@gmail.com>
Date: Fri, 30 Aug 2024 02:00:16 +0800
Subject: [PATCH] HDDS-11359. Intermittent timeout in
 TestPipelineManagerMXBean#testPipelineInfo (#7132)

---
 .../hadoop/hdds/scm/pipeline/TestPipelineManagerMXBean.java | 6 ++----
 1 file changed, 2 insertions(+), 4 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 75d860d951b..4a9efceeb7b 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;
@@ -62,16 +61,15 @@ public void init()
    *
    * @throws Exception
    */
-  @Flaky("HDDS-11359")
   @Test
   public void testPipelineInfo() throws Exception {
     ObjectName bean = new ObjectName(
         "Hadoop:service=SCMPipelineManager,name=SCMPipelineManagerInfo");
-    Map<String, Integer> pipelineStateCount = cluster
-        .getStorageContainerManager().getPipelineManager().getPipelineInfo();
 
     GenericTestUtils.waitFor(() -> {
       try {
+        Map<String, Integer> pipelineStateCount = cluster
+            .getStorageContainerManager().getPipelineManager().getPipelineInfo();
         final TabularData data = (TabularData) mbs.getAttribute(
             bean, "PipelineInfo");
         for (Map.Entry<String, Integer> entry : pipelineStateCount.entrySet()) {