Skip to content

HDDS-8428. Add MS or NS time unit suffix for CSMMetrics #4574

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 6 commits into from
May 18, 2023
Merged

HDDS-8428. Add MS or NS time unit suffix for CSMMetrics #4574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a294b9
HDDS-8428. Inconsistent Metrics units in CMSMetrics
xichen01 Apr 15, 2023
3003031
Add MS or NS time unit suffix for CSMMetrics
xichen01 Apr 18, 2023
c88331e
Remove old Metrics
xichen01 Apr 19, 2023
f7694be
Fix test
xichen01 Apr 20, 2023
d36a86c
Consistent function name
xichen01 Apr 20, 2023
39e4e21
Consistent function name
xichen01 Apr 20, 2023
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
32 changes: 16 additions & 16 deletions ...main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/CSMMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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");
}
}
Expand Down Expand Up @@ -191,14 +191,14 @@ public long getNumBytesCommittedCount() {
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() {
Expand All @@ -209,12 +209,12 @@ public void incNumContainerNotOpenVerifyFailures() {
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() {
Expand Down
6 changes: 3 additions & 3 deletions ...rg/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ private CompletableFuture<Message> handleWriteChunk(
write.getChunkData().getChunkName());
}
raftFuture.complete(r::toByteString);
metrics.recordWriteStateMachineCompletion(
metrics.recordWriteStateMachineCompletionNs(
Time.monotonicNowNanos() - startTime);
}

Expand Down Expand Up @@ -914,7 +914,7 @@ public CompletableFuture<Message> applyTransaction(TransactionContext trx) {
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
Expand Down Expand Up @@ -966,7 +966,7 @@ public CompletableFuture<Message> applyTransaction(TransactionContext trx) {
+ "{} exception {}", gid, requestProto.getCmdType(), index, t);
}
applyTransactionSemaphore.release();
metrics.recordApplyTransactionCompletion(
metrics.recordApplyTransactionCompletionNs(
Time.monotonicNowNanos() - applyTxnStartTime);
});
return applyTransactionFuture;
Expand Down
12 changes: 6 additions & 6 deletions .../java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,12 @@ static void runContainerStateMachineMetrics(
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
Expand All @@ -156,7 +156,7 @@ static void runContainerStateMachineMetrics(
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 =
Expand All @@ -171,10 +171,10 @@ static void runContainerStateMachineMetrics(
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 {
Expand Down