Skip to content

Commit

Permalink
HDDS-9377. Fix review notices
Browse files Browse the repository at this point in the history
  • Loading branch information
@juncevich
juncevich committed Feb 11, 2025
1 parent 62d9e47 commit b82ae65
Show file tree
Hide file tree
Showing 90 changed files with 507 additions and 553 deletions.
90 changes: 45 additions & 45 deletions hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/ContainerClientMetrics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
import org.apache.hadoop.metrics2.lib.MetricsRegistry;
import org.apache.hadoop.metrics2.lib.MutableCounterLong;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.metrics.OzoneMutableQuantiles;
import org.apache.hadoop.ozone.metrics.OzoneMutableRate;
import org.apache.hadoop.ozone.metrics.MutableQuantiles;
import org.apache.hadoop.ozone.metrics.MutableRate;
import org.apache.hadoop.ozone.util.MetricUtil;
import org.apache.hadoop.ozone.metrics.OzoneMetricsSystem;
import org.apache.hadoop.ozone.metrics.MetricsSystem;

import java.util.Map;
import java.util.UUID;
Expand All @@ -56,27 +56,27 @@ public final class ContainerClientMetrics {
private MutableCounterLong totalWriteChunkBytes;

@Metric
private OzoneMutableRate hsyncSynchronizedWorkNs;
private MutableRate hsyncSynchronizedWorkNs;
@Metric
private OzoneMutableRate hsyncSendWriteChunkNs;
private MutableRate hsyncSendWriteChunkNs;
@Metric
private OzoneMutableRate hsyncWaitForFlushNs;
private MutableRate hsyncWaitForFlushNs;
@Metric
private OzoneMutableRate hsyncWatchForCommitNs;
private MutableRate hsyncWatchForCommitNs;
@Metric
private MutableCounterLong writeChunksDuringWrite;
@Metric
private MutableCounterLong flushesDuringWrite;


private OzoneMutableQuantiles[] listBlockLatency;
private OzoneMutableQuantiles[] getBlockLatency;
private OzoneMutableQuantiles[] getCommittedBlockLengthLatency;
private OzoneMutableQuantiles[] readChunkLatency;
private OzoneMutableQuantiles[] getSmallFileLatency;
private OzoneMutableQuantiles[] hsyncLatencyNs;
private OzoneMutableQuantiles[] omHsyncLatencyNs;
private OzoneMutableQuantiles[] datanodeHsyncLatencyNs;
private MutableQuantiles[] listBlockLatency;
private MutableQuantiles[] getBlockLatency;
private MutableQuantiles[] getCommittedBlockLengthLatency;
private MutableQuantiles[] readChunkLatency;
private MutableQuantiles[] getSmallFileLatency;
private MutableQuantiles[] hsyncLatencyNs;
private MutableQuantiles[] omHsyncLatencyNs;
private MutableQuantiles[] datanodeHsyncLatencyNs;
private final Map<PipelineID, MutableCounterLong> writeChunkCallsByPipeline;
private final Map<PipelineID, MutableCounterLong> writeChunkBytesByPipeline;
private final Map<UUID, MutableCounterLong> writeChunksCallsByLeaders;
Expand All @@ -85,7 +85,7 @@ public final class ContainerClientMetrics {
public static synchronized ContainerClientMetrics acquire() {
if (instance == null) {
instanceCount++;
instance = OzoneMetricsSystem.instance().register(
instance = MetricsSystem.instance().register(
SOURCE_NAME + instanceCount,
"Ozone Client Metrics", new ContainerClientMetrics());
}
Expand All @@ -100,7 +100,7 @@ public static synchronized void release() {
referenceCount--;
if (referenceCount == 0) {
instance.stop();
OzoneMetricsSystem.instance().unregisterSource(
MetricsSystem.instance().unregisterSource(
SOURCE_NAME + instanceCount);
instance = null;
}
Expand All @@ -112,46 +112,46 @@ private ContainerClientMetrics() {
writeChunkBytesByPipeline = new ConcurrentHashMap<>();
writeChunksCallsByLeaders = new ConcurrentHashMap<>();

listBlockLatency = new OzoneMutableQuantiles[3];
getBlockLatency = new OzoneMutableQuantiles[3];
getCommittedBlockLengthLatency = new OzoneMutableQuantiles[3];
readChunkLatency = new OzoneMutableQuantiles[3];
getSmallFileLatency = new OzoneMutableQuantiles[3];
hsyncLatencyNs = new OzoneMutableQuantiles[3];
omHsyncLatencyNs = new OzoneMutableQuantiles[3];
datanodeHsyncLatencyNs = new OzoneMutableQuantiles[3];
listBlockLatency = new MutableQuantiles[3];
getBlockLatency = new MutableQuantiles[3];
getCommittedBlockLengthLatency = new MutableQuantiles[3];
readChunkLatency = new MutableQuantiles[3];
getSmallFileLatency = new MutableQuantiles[3];
hsyncLatencyNs = new MutableQuantiles[3];
omHsyncLatencyNs = new MutableQuantiles[3];
datanodeHsyncLatencyNs = new MutableQuantiles[3];
int[] intervals = {60, 300, 900};
for (int i = 0; i < intervals.length; i++) {
int interval = intervals[i];
listBlockLatency[i] = OzoneMetricsSystem.registerNewMutableQuantiles(registry,
listBlockLatency[i] = MetricsSystem.registerNewMutableQuantiles(registry,
"listBlockLatency" + interval
+ "s", "ListBlock latency in microseconds", "ops",
"latency", interval);
getBlockLatency[i] = OzoneMetricsSystem.registerNewMutableQuantiles(registry,
getBlockLatency[i] = MetricsSystem.registerNewMutableQuantiles(registry,
"getBlockLatency" + interval
+ "s", "GetBlock latency in microseconds", "ops",
"latency", interval);
getCommittedBlockLengthLatency[i] = OzoneMetricsSystem.registerNewMutableQuantiles(registry,
getCommittedBlockLengthLatency[i] = MetricsSystem.registerNewMutableQuantiles(registry,
"getCommittedBlockLengthLatency" + interval
+ "s", "GetCommittedBlockLength latency in microseconds",
"ops", "latency", interval);
readChunkLatency[i] = OzoneMetricsSystem.registerNewMutableQuantiles(registry,
readChunkLatency[i] = MetricsSystem.registerNewMutableQuantiles(registry,
"readChunkLatency" + interval
+ "s", "ReadChunk latency in microseconds", "ops",
"latency", interval);
getSmallFileLatency[i] = OzoneMetricsSystem.registerNewMutableQuantiles(registry,
getSmallFileLatency[i] = MetricsSystem.registerNewMutableQuantiles(registry,
"getSmallFileLatency" + interval
+ "s", "GetSmallFile latency in microseconds", "ops",
"latency", interval);
hsyncLatencyNs[i] = OzoneMetricsSystem.registerNewMutableQuantiles(registry,
hsyncLatencyNs[i] = MetricsSystem.registerNewMutableQuantiles(registry,
"hsyncLatency" + interval
+ "s", "client hsync latency in nanoseconds", "ops",
"latency", interval);
omHsyncLatencyNs[i] = OzoneMetricsSystem.registerNewMutableQuantiles(registry,
omHsyncLatencyNs[i] = MetricsSystem.registerNewMutableQuantiles(registry,
"omHsyncLatency" + interval
+ "s", "client hsync latency to OM in nanoseconds", "ops",
"latency", interval);
datanodeHsyncLatencyNs[i] = OzoneMetricsSystem.registerNewMutableQuantiles(
datanodeHsyncLatencyNs[i] = MetricsSystem.registerNewMutableQuantiles(
registry,
"dnHsyncLatency" + interval
+ "s", "client hsync latency to DN in nanoseconds", "ops",
Expand Down Expand Up @@ -196,63 +196,63 @@ public void recordWriteChunk(Pipeline pipeline, long chunkSizeBytes) {
}

public void addListBlockLatency(long latency) {
for (OzoneMutableQuantiles q : listBlockLatency) {
for (MutableQuantiles q : listBlockLatency) {
if (q != null) {
q.add(latency);
}
}
}

public void addHsyncLatency(long hsyncLatencyTime) {
for (OzoneMutableQuantiles q : hsyncLatencyNs) {
for (MutableQuantiles q : hsyncLatencyNs) {
if (q != null) {
q.add(hsyncLatencyTime);
}
}
}

public void addGetBlockLatency(long latency) {
for (OzoneMutableQuantiles q : getBlockLatency) {
for (MutableQuantiles q : getBlockLatency) {
if (q != null) {
q.add(latency);
}
}
}

public void addOMHsyncLatency(long hsyncLatencyTime) {
for (OzoneMutableQuantiles q : omHsyncLatencyNs) {
for (MutableQuantiles q : omHsyncLatencyNs) {
if (q != null) {
q.add(hsyncLatencyTime);
}
}
}

public void addGetCommittedBlockLengthLatency(long latency) {
for (OzoneMutableQuantiles q : getCommittedBlockLengthLatency) {
for (MutableQuantiles q : getCommittedBlockLengthLatency) {
if (q != null) {
q.add(latency);
}
}
}

public void addReadChunkLatency(long latency) {
for (OzoneMutableQuantiles q : readChunkLatency) {
for (MutableQuantiles q : readChunkLatency) {
if (q != null) {
q.add(latency);
}
}
}

public void addGetSmallFileLatency(long latency) {
for (OzoneMutableQuantiles q : getSmallFileLatency) {
for (MutableQuantiles q : getSmallFileLatency) {
if (q != null) {
q.add(latency);
}
}
}

public void addDataNodeHsyncLatency(long hsyncLatencyTime) {
for (OzoneMutableQuantiles q : datanodeHsyncLatencyNs) {
for (MutableQuantiles q : datanodeHsyncLatencyNs) {
if (q != null) {
q.add(hsyncLatencyTime);
}
Expand Down Expand Up @@ -280,19 +280,19 @@ Map<UUID, MutableCounterLong> getWriteChunksCallsByLeaders() {
return writeChunksCallsByLeaders;
}

public OzoneMutableRate getHsyncSynchronizedWorkNs() {
public MutableRate getHsyncSynchronizedWorkNs() {
return hsyncSynchronizedWorkNs;
}

public OzoneMutableRate getHsyncSendWriteChunkNs() {
public MutableRate getHsyncSendWriteChunkNs() {
return hsyncSendWriteChunkNs;
}

public OzoneMutableRate getHsyncWaitForFlushNs() {
public MutableRate getHsyncWaitForFlushNs() {
return hsyncWaitForFlushNs;
}

public OzoneMutableRate getHsyncWatchForCommitNs() {
public MutableRate getHsyncWatchForCommitNs() {
return hsyncWatchForCommitNs;
}

Expand Down
9 changes: 4 additions & 5 deletions hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientMetrics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,13 @@
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.metrics2.MetricsSource;
import org.apache.hadoop.metrics2.MetricsSystem;
import org.apache.hadoop.metrics2.annotation.Metric;
import org.apache.hadoop.metrics2.annotation.Metrics;
import org.apache.hadoop.metrics2.lib.MetricsRegistry;
import org.apache.hadoop.metrics2.lib.MutableCounterLong;
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.util.PerformanceMetrics;
import org.apache.hadoop.ozone.metrics.OzoneMetricsSystem;
import org.apache.hadoop.ozone.metrics.MetricsSystem;

import java.util.EnumMap;

Expand Down Expand Up @@ -79,8 +78,8 @@ public void init() {
}

public static XceiverClientMetrics create() {
OzoneMetricsSystem.initialize(SOURCE_NAME);
return OzoneMetricsSystem.register(SOURCE_NAME, "Storage Container Client Metrics",
MetricsSystem.initialize(SOURCE_NAME);
return MetricsSystem.register(SOURCE_NAME, "Storage Container Client Metrics",
new XceiverClientMetrics());
}

Expand Down Expand Up @@ -130,7 +129,7 @@ public void reset() {

public void unRegister() {
IOUtils.closeQuietly(containerOpsLatency.values());
MetricsSystem ms = OzoneMetricsSystem.instance();
org.apache.hadoop.metrics2.MetricsSystem ms = MetricsSystem.instance();
ms.unregisterSource(SOURCE_NAME);
}

Expand Down
34 changes: 17 additions & 17 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/grpc/metrics/GrpcMetrics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
import org.apache.hadoop.metrics2.lib.MetricsRegistry;
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.metrics.OzoneMutableQuantiles;
import org.apache.hadoop.ozone.metrics.MutableQuantiles;
import org.apache.hadoop.ozone.util.MetricUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.ozone.metrics.OzoneMetricsSystem;
import org.apache.hadoop.ozone.metrics.OzoneMutableRate;
import org.apache.hadoop.ozone.metrics.MetricsSystem;
import org.apache.hadoop.ozone.metrics.MutableRate;

/**
* Class which maintains metrics related to using GRPC.
Expand Down Expand Up @@ -67,16 +67,16 @@ public GrpcMetrics(Configuration conf) {
grpcQuantileEnable = (intervals.length > 0);
if (grpcQuantileEnable) {
grpcQueueTimeMillisQuantiles =
new OzoneMutableQuantiles[intervals.length];
new MutableQuantiles[intervals.length];
grpcProcessingTimeMillisQuantiles =
new OzoneMutableQuantiles[intervals.length];
new MutableQuantiles[intervals.length];
for (int i = 0; i < intervals.length; i++) {
int interval = intervals[i];
grpcQueueTimeMillisQuantiles[i] = OzoneMetricsSystem
grpcQueueTimeMillisQuantiles[i] = MetricsSystem
.registerNewMutableQuantiles(registry, "grpcQueueTime" + interval
+ "s", "grpc queue time in millisecond", "ops",
"latency", interval);
grpcProcessingTimeMillisQuantiles[i] = OzoneMetricsSystem.registerNewMutableQuantiles(registry,
grpcProcessingTimeMillisQuantiles[i] = MetricsSystem.registerNewMutableQuantiles(registry,
"grpcProcessingTime" + interval + "s",
"grpc processing time in millisecond",
"ops", "latency", interval);
Expand All @@ -92,15 +92,15 @@ public GrpcMetrics(Configuration conf) {
*/
public static synchronized GrpcMetrics create(Configuration conf) {
GrpcMetrics metrics = new GrpcMetrics(conf);
return OzoneMetricsSystem.instance().register(SOURCE_NAME,
return MetricsSystem.instance().register(SOURCE_NAME,
"Metrics for using gRPC", metrics);
}

/**
* Unregister the metrics instance.
*/
public void unRegister() {
OzoneMetricsSystem.instance().unregisterSource(SOURCE_NAME);
MetricsSystem.instance().unregisterSource(SOURCE_NAME);
MetricUtil.stop(grpcProcessingTimeMillisQuantiles);
MetricUtil.stop(grpcQueueTimeMillisQuantiles);
}
Expand All @@ -125,18 +125,18 @@ public synchronized void getMetrics(MetricsCollector collector, boolean all) {
private MutableCounterLong unknownMessagesReceived;

@Metric("Queue time")
private OzoneMutableRate grpcQueueTime;
private MutableRate grpcQueueTime;

// There should be no getter method to avoid
// exposing internal representation. FindBugs error raised.
private OzoneMutableQuantiles[] grpcQueueTimeMillisQuantiles;
private MutableQuantiles[] grpcQueueTimeMillisQuantiles;

@Metric("Processsing time")
private OzoneMutableRate grpcProcessingTime;
private MutableRate grpcProcessingTime;

// There should be no getter method to avoid
// exposing internal representation. FindBugs error raised.
private OzoneMutableQuantiles[] grpcProcessingTimeMillisQuantiles;
private MutableQuantiles[] grpcProcessingTimeMillisQuantiles;

@Metric("Number of active clients connected")
private MutableCounterLong numOpenClientConnections;
Expand All @@ -160,7 +160,7 @@ public void incrUnknownMessagesReceived() {
public void addGrpcQueueTime(int queueTime) {
grpcQueueTime.add(queueTime);
if (grpcQuantileEnable) {
for (OzoneMutableQuantiles q : grpcQueueTimeMillisQuantiles) {
for (MutableQuantiles q : grpcQueueTimeMillisQuantiles) {
if (q != null) {
q.add(queueTime);
}
Expand All @@ -171,7 +171,7 @@ public void addGrpcQueueTime(int queueTime) {
public void addGrpcProcessingTime(int processingTime) {
grpcProcessingTime.add(processingTime);
if (grpcQuantileEnable) {
for (OzoneMutableQuantiles q : grpcProcessingTimeMillisQuantiles) {
for (MutableQuantiles q : grpcProcessingTimeMillisQuantiles) {
if (q != null) {
q.add(processingTime);
}
Expand Down Expand Up @@ -203,11 +203,11 @@ public long getUnknownMessagesReceived() {
return unknownMessagesReceived.value();
}

OzoneMutableRate getGrpcQueueTime() {
MutableRate getGrpcQueueTime() {
return grpcQueueTime;
}

OzoneMutableRate getGrpcProcessingTime() {
MutableRate getGrpcProcessingTime() {
return grpcProcessingTime;
}

Expand Down
Loading

0 comments on commit b82ae65

Please sign in to comment.