Cleaned up some code.

jianghuazhu · Dec 20, 2024 · cb607bd · cb607bd
1 parent 415799f
commit cb607bd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/ratis-common/src/main/java/org/apache/ratis/util/ReferenceCountedLeakDetector.java b/ratis-common/src/main/java/org/apache/ratis/util/ReferenceCountedLeakDetector.java
@@ -33,6 +33,7 @@
 public final class ReferenceCountedLeakDetector {
   private static final Logger LOG = LoggerFactory.getLogger(ReferenceCountedLeakDetector.class);
   // Leak detection is turned off by default.
+
   private static final AtomicReference<Mode> FACTORY = new AtomicReference<>(Mode.NONE);
   private static final Supplier<LeakDetector> SUPPLIER
       = MemoizedSupplier.valueOf(() -> new LeakDetector(FACTORY.get().name()).start());

diff --git a/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java b/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java
@@ -310,13 +310,6 @@ public CompletableFuture<LifeCycle.State> stopAsync() {
       grpcServerMetrics.unregister();
       return super.stopAsync();
     }
-    /*grpcServerMetrics.unregister();
-    CompletableFuture<LifeCycle.State> future = super.stopAsync();
-    if (appendLogRequestObserver != null) {
-      appendLogRequestObserver.stop();
-      appendLogRequestObserver = null;
-    }
-    return future;*/
   }
 
   @Override

diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/LogSegment.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/LogSegment.java
@@ -281,8 +281,8 @@ public ReferenceCountedObject<LogEntryProto> load(LogRecord key) throws IOExcept
       final AtomicReference<ReferenceCountedObject<LogEntryProto>> toReturn = new AtomicReference<>();
       final LogSegmentStartEnd startEnd = LogSegmentStartEnd.valueOf(startIndex, endIndex, isOpen);
       readSegmentFile(file, startEnd, maxOpSize, getLogCorruptionPolicy(), raftLogMetrics, entryRef -> {
+        final LogEntryProto entry = entryRef.retain();
         try {
-          final LogEntryProto entry = entryRef.retain();
           final TermIndex ti = TermIndex.valueOf(entry);
           putEntryCache(ti, entryRef, Op.LOAD_SEGMENT_FILE);
           if (ti.equals(key.getTermIndex())) {

diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java
@@ -282,17 +282,14 @@ private void loadLogSegments(long lastIndexInSnapshot,
 
   @Override
   public LogEntryProto get(long index) throws RaftLogIOException {
-    ReferenceCountedObject<LogEntryProto> ref = null;
+    final ReferenceCountedObject<LogEntryProto> ref = retainLog(index);
+    if (ref == null) {
+      return null;
+    }
     try {
-      ref = retainLog(index);
-      if (ref == null) {
-        return null;
-      }
       return LogProtoUtils.copy(ref.get());
     } finally {
-      if (ref != null) {
-        ref.release();
-      }
+      ref.release();
     }
   }