This is an automated email from the ASF dual-hosted git repository.
szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis.git
The following commit(s) were added to refs/heads/master by this push:
new 72f46fbc7 RATIS-2405. Remove duplicate computeIfAbsent call in
MessageMetrics.inc() method. (#1346)
72f46fbc7 is described below
commit 72f46fbc760f39e549b7fa977f28b1eac48f1e63
Author: slfan1989 <[email protected]>
AuthorDate: Thu Feb 12 06:02:56 2026 +0800
RATIS-2405. Remove duplicate computeIfAbsent call in MessageMetrics.inc()
method. (#1346)
---
.../java/org/apache/ratis/grpc/metrics/MessageMetrics.java | 8 --------
.../org/apache/ratis/grpc/server/TestGrpcMessageMetrics.java | 10 +++++++---
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git
a/ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/MessageMetrics.java
b/ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/MessageMetrics.java
index 2a211aae8..b152c6709 100644
--- a/ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/MessageMetrics.java
+++ b/ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/MessageMetrics.java
@@ -61,14 +61,6 @@ public class MessageMetrics extends RatisMetrics {
types.get(t)
.computeIfAbsent(metricNamePrefix, prefix ->
getRegistry().counter(prefix + t.getSuffix()))
.inc();
- final Map<String, LongCounter> counters = types.get(t);
- LongCounter c = counters.get(metricNamePrefix);
- if (c == null) {
- synchronized (counters) {
- c = counters.computeIfAbsent(metricNamePrefix, prefix ->
getRegistry().counter(prefix + t.getSuffix()));
- }
- }
- c.inc();
}
/**
diff --git
a/ratis-test/src/test/java/org/apache/ratis/grpc/server/TestGrpcMessageMetrics.java
b/ratis-test/src/test/java/org/apache/ratis/grpc/server/TestGrpcMessageMetrics.java
index 8094069cf..a8cd6138e 100644
---
a/ratis-test/src/test/java/org/apache/ratis/grpc/server/TestGrpcMessageMetrics.java
+++
b/ratis-test/src/test/java/org/apache/ratis/grpc/server/TestGrpcMessageMetrics.java
@@ -19,6 +19,7 @@ package org.apache.ratis.grpc.server;
import org.apache.ratis.BaseTest;
import org.apache.ratis.grpc.MiniRaftClusterWithGrpc;
+import org.apache.ratis.grpc.metrics.MessageMetrics;
import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
@@ -69,7 +70,10 @@ public class TestGrpcMessageMetrics extends BaseTest
final GrpcServicesImpl services = (GrpcServicesImpl)
RaftServerTestUtil.getServerRpc(server);
final RatisMetricRegistry registry =
services.getMessageMetrics().getRegistry();
String counter_prefix = serverId + "_" +
"ratis.grpc.RaftServerProtocolService";
- Assertions.assertTrue(
- registry.counter(counter_prefix + "_" + "requestVote" +
"_OK_completed_total").getCount() > 0);
+ final String metricPrefix = counter_prefix + "_" + "requestVote" + "_OK";
+ final long before = registry.counter(metricPrefix +
"_completed_total").getCount();
+ services.getMessageMetrics().rpcCompleted(metricPrefix);
+ final long after = registry.counter(metricPrefix +
"_completed_total").getCount();
+ Assertions.assertEquals(before + 1, after);
}
-}
\ No newline at end of file
+}