This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 99af5998f9 HDDS-8428. Add time unit suffix for CSMMetrics (#4574)
99af5998f9 is described below
commit 99af5998f9dc63c03adc76317fd3e9a5bdb7a3b7
Author: XiChen <[email protected]>
AuthorDate: Fri May 19 04:42:46 2023 +0800
HDDS-8428. Add time unit suffix for CSMMetrics (#4574)
---
.../common/transport/server/ratis/CSMMetrics.java | 32 +++++++++++-----------
.../server/ratis/ContainerStateMachine.java | 6 ++--
.../transport/server/ratis/TestCSMMetrics.java | 12 ++++----
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/CSMMetrics.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/CSMMetrics.java
index 557473bf9c..d5c4f7ba0e 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/CSMMetrics.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/CSMMetrics.java
@@ -46,8 +46,8 @@ public class CSMMetrics {
private @Metric MutableCounterLong numBytesWrittenCount;
private @Metric MutableCounterLong numBytesCommittedCount;
- private @Metric MutableRate transactionLatency;
- private MutableRate[] opsLatency;
+ private @Metric MutableRate transactionLatencyMs;
+ private MutableRate[] opsLatencyMs;
private MetricsRegistry registry = null;
// Failure Metrics
@@ -62,16 +62,16 @@ public class CSMMetrics {
private @Metric MutableCounterLong numDataCacheMiss;
private @Metric MutableCounterLong numDataCacheHit;
- private @Metric MutableRate applyTransaction;
- private @Metric MutableRate writeStateMachineData;
+ private @Metric MutableRate applyTransactionNs;
+ private @Metric MutableRate writeStateMachineDataNs;
public CSMMetrics() {
int numCmdTypes = ContainerProtos.Type.values().length;
- this.opsLatency = new MutableRate[numCmdTypes];
+ this.opsLatencyMs = new MutableRate[numCmdTypes];
this.registry = new MetricsRegistry(CSMMetrics.class.getSimpleName());
for (int i = 0; i < numCmdTypes; i++) {
- opsLatency[i] = registry.newRate(
- ContainerProtos.Type.forNumber(i + 1).toString(),
+ opsLatencyMs[i] = registry.newRate(
+ ContainerProtos.Type.forNumber(i + 1).toString() + "Ms",
ContainerProtos.Type.forNumber(i + 1) + " op");
}
}
@@ -191,14 +191,14 @@ public class CSMMetrics {
return numBytesCommittedCount.value();
}
- public MutableRate getApplyTransactionLatency() {
- return applyTransaction;
+ public MutableRate getApplyTransactionLatencyNs() {
+ return applyTransactionNs;
}
- public void incPipelineLatency(ContainerProtos.Type type,
+ public void incPipelineLatencyMs(ContainerProtos.Type type,
long latencyMillis) {
- opsLatency[type.ordinal()].add(latencyMillis);
- transactionLatency.add(latencyMillis);
+ opsLatencyMs[type.ordinal()].add(latencyMillis);
+ transactionLatencyMs.add(latencyMillis);
}
public void incNumStartTransactionVerifyFailures() {
@@ -209,12 +209,12 @@ public class CSMMetrics {
numContainerNotOpenVerifyFailures.incr();
}
- public void recordApplyTransactionCompletion(long latencyNanos) {
- applyTransaction.add(latencyNanos);
+ public void recordApplyTransactionCompletionNs(long latencyNanos) {
+ applyTransactionNs.add(latencyNanos);
}
- public void recordWriteStateMachineCompletion(long latencyNanos) {
- writeStateMachineData.add(latencyNanos);
+ public void recordWriteStateMachineCompletionNs(long latencyNanos) {
+ writeStateMachineDataNs.add(latencyNanos);
}
public void incNumDataCacheMiss() {
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
index 7d7b28999f..0af9657b69 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
@@ -540,7 +540,7 @@ public class ContainerStateMachine extends BaseStateMachine
{
write.getChunkData().getChunkName());
}
raftFuture.complete(r::toByteString);
- metrics.recordWriteStateMachineCompletion(
+ metrics.recordWriteStateMachineCompletionNs(
Time.monotonicNowNanos() - startTime);
}
@@ -914,7 +914,7 @@ public class ContainerStateMachine extends BaseStateMachine
{
if (trx.getServerRole() == RaftPeerRole.LEADER
&& trx.getStateMachineContext() != null) {
long startTime = (long) trx.getStateMachineContext();
- metrics.incPipelineLatency(cmdType,
+ metrics.incPipelineLatencyMs(cmdType,
(Time.monotonicNowNanos() - startTime) / 1000000L);
}
// ignore close container exception while marking the stateMachine
@@ -966,7 +966,7 @@ public class ContainerStateMachine extends BaseStateMachine
{
+ "{} exception {}", gid, requestProto.getCmdType(), index, t);
}
applyTransactionSemaphore.release();
- metrics.recordApplyTransactionCompletion(
+ metrics.recordApplyTransactionCompletionNs(
Time.monotonicNowNanos() - applyTxnStartTime);
});
return applyTransactionFuture;
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java
index 157bc94f00..b3d6589cff 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java
@@ -129,12 +129,12 @@ public class TestCSMMetrics {
assertCounter("NumBytesCommittedCount", 0L, metric);
assertCounter("NumStartTransactionVerifyFailures", 0L, metric);
assertCounter("NumContainerNotOpenVerifyFailures", 0L, metric);
- assertCounter("WriteChunkNumOps", 0L, metric);
+ assertCounter("WriteChunkMsNumOps", 0L, metric);
double applyTransactionLatency = getDoubleGauge(
- "ApplyTransactionAvgTime", metric);
+ "ApplyTransactionNsAvgTime", metric);
assertTrue(applyTransactionLatency == 0.0);
double writeStateMachineLatency = getDoubleGauge(
- "WriteStateMachineDataAvgTime", metric);
+ "WriteStateMachineDataNsAvgTime", metric);
assertTrue(writeStateMachineLatency == 0.0);
// Write Chunk
@@ -156,7 +156,7 @@ public class TestCSMMetrics {
assertCounter("NumBytesCommittedCount", 1024L, metric);
assertCounter("NumStartTransactionVerifyFailures", 0L, metric);
assertCounter("NumContainerNotOpenVerifyFailures", 0L, metric);
- assertCounter("WriteChunkNumOps", 1L, metric);
+ assertCounter("WriteChunkMsNumOps", 1L, metric);
//Read Chunk
ContainerProtos.ContainerCommandRequestProto readChunkRequest =
@@ -171,10 +171,10 @@ public class TestCSMMetrics {
assertCounter("NumQueryStateMachineOps", 1L, metric);
assertCounter("NumApplyTransactionOps", 1L, metric);
applyTransactionLatency = getDoubleGauge(
- "ApplyTransactionAvgTime", metric);
+ "ApplyTransactionNsAvgTime", metric);
assertTrue(applyTransactionLatency > 0.0);
writeStateMachineLatency = getDoubleGauge(
- "WriteStateMachineDataAvgTime", metric);
+ "WriteStateMachineDataNsAvgTime", metric);
assertTrue(writeStateMachineLatency > 0.0);
} finally {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
