diff --git a/ratis-common/src/main/java/org/apache/ratis/util/AwaitToRun.java b/ratis-common/src/main/java/org/apache/ratis/util/AwaitToRun.java index 0222c1dc10..f0f01d1362 100644 --- a/ratis-common/src/main/java/org/apache/ratis/util/AwaitToRun.java +++ b/ratis-common/src/main/java/org/apache/ratis/util/AwaitToRun.java @@ -44,7 +44,9 @@ private RunnableImpl(Runnable runMethod) { public void run() { while(!Thread.currentThread().isInterrupted()) { try { + System.out.println("YYYY Before awaitForSignal.await()"); awaitForSignal.await(); + System.out.println("YYYY After awaitForSignal.await()"); } catch (InterruptedException e) { LOG.info("{} is interrupted", awaitForSignal); Thread.currentThread().interrupt(); diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogCache.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogCache.java index ad16332326..7c73838cd7 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogCache.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogCache.java @@ -448,12 +448,14 @@ long getOpenSegmentSizeInBytes() { boolean shouldEvict() { final CacheInfo closedSegmentsCacheInfo = closedSegments.getCacheInfo(); + System.out.println("YYYY: should: " + (closedSegmentsCacheInfo.getCount() > maxCachedSegments) + ", closedSegmentsCacheInfo.getCount(): " + closedSegmentsCacheInfo.getCount() + ", maxCachedSegments: " + maxCachedSegments); if (closedSegmentsCacheInfo.getCount() > maxCachedSegments) { return true; } final long size = closedSegmentsCacheInfo.getSize() + Optional.ofNullable(openSegment).map(LogSegment::getTotalCacheSize).orElse(0L); + System.out.println("YYYY: should: " + (size > maxSegmentCacheSize) + " size: " + size + ", maxSegmentCacheSize: " + maxSegmentCacheSize); return size > maxSegmentCacheSize; } diff --git a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java index 7b20babf4d..0961b98cd6 100644 --- a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java +++ b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java @@ -442,7 +442,8 @@ private void testTruncate(List entries, long fromIndex) private void checkEntries(RaftLog raftLog, List expected, int offset, int size) throws IOException { if (size > 0) { - for (int i = offset; i < size + offset; i++) { + int i = offset; + for (; i < size + offset; i++) { LogEntryProto entry = raftLog.get(expected.get(i).getIndex()); Assertions.assertEquals(expected.get(i), entry); }