[ratis] branch master updated: RATIS-1852. Fix trivial SonarLint complains (#888)

[szetszwo]

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 4d204899a RATIS-1852. Fix trivial SonarLint complains (#888)
4d204899a is described below

commit 4d204899ae1f26375028b78779785453fe3b9496
Author: William Song <48054931+szywill...@users.noreply.github.com>
AuthorDate: Thu Jun 29 11:22:44 2023 +0800

    RATIS-1852. Fix trivial SonarLint complains (#888)
---
 .../ratis/grpc/metrics/intercept/server/MetricServerCall.java       | 2 --
 .../grpc/metrics/intercept/server/MetricServerCallListener.java     | 2 --
 .../ratis/server/raftlog/segmented/SegmentedRaftLogReader.java      | 6 +++---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git 
a/ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/intercept/server/MetricServerCall.java
 
b/ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/intercept/server/MetricServerCall.java
index 5eb3f2930..54a288bd3 100644
--- 
a/ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/intercept/server/MetricServerCall.java
+++ 
b/ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/intercept/server/MetricServerCall.java
@@ -27,13 +27,11 @@ import org.apache.ratis.grpc.metrics.MessageMetrics;
 class MetricServerCall<R,S> extends 
ForwardingServerCall.SimpleForwardingServerCall<R,S> {
   private final MessageMetrics metrics;
   private final String metricNamPrefix;
-  private final ServerCall<R,S> delegate;
 
   MetricServerCall(ServerCall<R,S> delegate,
                        String metricNamPrefix,
                        MessageMetrics metrics){
     super(delegate);
-    this.delegate = delegate;
     this.metricNamPrefix = metricNamPrefix;
     this.metrics = metrics;
 
diff --git 
a/ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/intercept/server/MetricServerCallListener.java
 
b/ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/intercept/server/MetricServerCallListener.java
index 27d2bef70..104f9883a 100644
--- 
a/ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/intercept/server/MetricServerCallListener.java
+++ 
b/ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/intercept/server/MetricServerCallListener.java
@@ -26,7 +26,6 @@ import org.apache.ratis.grpc.metrics.MessageMetrics;
 @SuppressFBWarnings("URF_UNREAD_FIELD")
 public class MetricServerCallListener<R> extends 
ForwardingServerCallListener<R> {
   private final ServerCall.Listener<R> delegate;
-  private final String metricNamePrefix;
   private MessageMetrics metrics;
 
   MetricServerCallListener(
@@ -35,7 +34,6 @@ public class MetricServerCallListener<R> extends 
ForwardingServerCallListener<R>
       MessageMetrics metrics
   ){
     this.delegate = delegate;
-    this.metricNamePrefix = metricNamePrefix;
     this.metrics = metrics;
   }
 
diff --git 
a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java
 
b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java
index 4cb9e3130..53cb06186 100644
--- 
a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java
+++ 
b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java
@@ -47,7 +47,7 @@ class SegmentedRaftLogReader implements Closeable {
    */
   static class LimitedInputStream extends FilterInputStream {
     private long curPos = 0;
-    private long markPos = -1;
+    private volatile long markPos = -1;
     private long limitPos = Long.MAX_VALUE;
 
     LimitedInputStream(InputStream is) {
@@ -101,13 +101,13 @@ class SegmentedRaftLogReader implements Closeable {
     }
 
     @Override
-    public void mark(int limit) {
+    public synchronized void mark(int limit) {
       super.mark(limit);
       markPos = curPos;
     }
 
     @Override
-    public void reset() throws IOException {
+    public synchronized void reset() throws IOException {
       if (markPos == -1) {
         throw new IOException("Not marked!");
       }