Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -495,7 +494,6 @@ void testIncrementalWaitTimeWithSameNodeFailover() throws Exception {
omFailoverProxyProvider.getWaitTime());
}

@Flaky("HDDS-11353")
@Test
void testOMHAMetrics() throws Exception {
// Get leader OM
Expand All @@ -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
Comment on lines +514 to +516
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I don't think it's worth updating just for this, but if you need to change the patch for any other reason:

Suggested change
// Do some writes so that the old leader can receive AppendEntries
// which will trigger notifyLeaderChanged, instead of relying on
// AppendEntries
// Do some writes so that the old leader can receive AppendEntries
// which will trigger notifyLeaderChanged, instead of relying on
// AppendEntries from heartbeats

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the review, I missed that. I'll update this if there are any other changes.

setupBucket();

// Get the new leader
OzoneManager newLeaderOM = getCluster().getOMLeader();
String newLeaderOMId = newLeaderOM.getOMNodeId();
Expand Down