diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithStoppedNodes.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithStoppedNodes.java index ceda27f5f24..94c93d8dbe8 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithStoppedNodes.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithStoppedNodes.java @@ -71,7 +71,6 @@ import org.apache.hadoop.security.UserGroupInformation; import org.apache.log4j.Logger; import org.apache.ozone.test.GenericTestUtils; -import org.apache.ozone.test.tag.Flaky; import org.apache.ratis.client.RaftClient; import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.protocol.ClientId; @@ -495,7 +494,6 @@ void testIncrementalWaitTimeWithSameNodeFailover() throws Exception { omFailoverProxyProvider.getWaitTime()); } - @Flaky("HDDS-11353") @Test void testOMHAMetrics() throws Exception { // Get leader OM @@ -513,6 +511,11 @@ void testOMHAMetrics() throws Exception { getCluster().restartOzoneManager(leaderOM, true); waitForLeaderToBeReady(); + // Do some writes so that the old leader can receive AppendEntries + // which will trigger notifyLeaderChanged, instead of relying on + // AppendEntries + setupBucket(); + // Get the new leader OzoneManager newLeaderOM = getCluster().getOMLeader(); String newLeaderOMId = newLeaderOM.getOMNodeId();