Skip to content

HDDS-12489. Intermittent timeout in TestSCMContainerManagerMetrics.testReportProcessingMetrics #8021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 3 commits into from
Mar 8, 2025
Merged

HDDS-12489. Intermittent timeout in TestSCMContainerManagerMetrics.testReportProcessingMetrics #8021

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d861a2
HDDS-12489. Intermittent timeout in TestSCMContainerManagerMetrics.te…
adoroszlai Mar 7, 2025
937bb62
simplify key creation
adoroszlai Mar 7, 2025
50130c8
closeAllContainers before creating key
adoroszlai Mar 8, 2025
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
30 changes: 5 additions & 25 deletions ...est/java/org/apache/hadoop/hdds/scm/container/metrics/TestSCMContainerManagerMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,16 @@

package org.apache.hadoop.hdds.scm.container.metrics;

import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.ozone.test.MetricsAsserts.getLongCounter;
import static org.apache.ozone.test.MetricsAsserts.getMetrics;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;

import java.io.IOException;
import java.util.HashMap;
import java.util.UUID;
import org.apache.commons.lang3.RandomUtils;
import org.apache.hadoop.hdds.client.ECReplicationConfig;
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
import org.apache.hadoop.hdds.client.ReplicationFactor;
import org.apache.hadoop.hdds.client.ReplicationType;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.scm.container.ContainerID;
import org.apache.hadoop.hdds.scm.container.ContainerInfo;
Expand All @@ -41,8 +36,9 @@
import org.apache.hadoop.hdds.utils.IOUtils;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.OzoneTestUtils;
import org.apache.hadoop.ozone.TestDataUtil;
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.NonHATests;
import org.junit.jupiter.api.AfterEach;
Expand Down Expand Up @@ -134,37 +130,21 @@ public void testContainerOpsMetrics() throws Exception {

@Test
public void testReportProcessingMetrics() throws Exception {
String volumeName = "vol-" + UUID.randomUUID();
String bucketName = "bucket1";
String key = "key1";

MetricsRecordBuilder metrics =
getMetrics(SCMContainerManagerMetrics.class.getSimpleName());
assertThat(getLongCounter("NumContainerReportsProcessedSuccessful", metrics))
.isPositive();

final long previous = getLongCounter("NumICRReportsProcessedSuccessful", metrics);
OzoneTestUtils.closeAllContainers(scm.getEventQueue(), scm);

// Create key should create container on DN.
client.getObjectStore().getClientProxy()
.createVolume(volumeName);
client.getObjectStore().getClientProxy()
.createBucket(volumeName, bucketName);
OzoneOutputStream ozoneOutputStream = client
.getObjectStore().getClientProxy().createKey(volumeName, bucketName,
key, 0, ReplicationType.RATIS, ReplicationFactor.ONE,
new HashMap<>());

String data = "file data";
ozoneOutputStream.write(data.getBytes(UTF_8), 0, data.length());
ozoneOutputStream.close();

TestDataUtil.createKeys(cluster(), 1);

GenericTestUtils.waitFor(() -> {
final MetricsRecordBuilder scmMetrics =
getMetrics(SCMContainerManagerMetrics.class.getSimpleName());
return getLongCounter("NumICRReportsProcessedSuccessful",
scmMetrics) >= previous + 1;
return getLongCounter("NumICRReportsProcessedSuccessful", scmMetrics) > previous;
}, 100, 30_000);
}
}