This is an automated email from the ASF dual-hosted git repository.
CRZbulabula pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 8a5e5ca5444 Fix stale Ratis log size accounting in DiskGuardian
(#19067)
8a5e5ca5444 is described below
commit 8a5e5ca5444427a68e5597ed3211a223a8103555
Author: d-wang-commit <[email protected]>
AuthorDate: Sat Oct 31 12:42:38 2026 +0800
Fix stale Ratis log size accounting in DiskGuardian (#19067)
Recompute open and closed log segment sizes on each scan.
Cover same-path growth, recreation, rotation, and deletion with regression
tests.
---
.../apache/iotdb/consensus/ratis/DiskGuardian.java | 27 +++---
.../iotdb/consensus/ratis/RaftLogSummaryTest.java | 108 +++++++++++++++++++++
2 files changed, 119 insertions(+), 16 deletions(-)
diff --git
a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/DiskGuardian.java
b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/DiskGuardian.java
index ed3869587d6..9973bea8335 100644
---
a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/DiskGuardian.java
+++
b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/DiskGuardian.java
@@ -50,6 +50,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Predicate;
import java.util.function.Supplier;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -69,16 +70,16 @@ class DiskGuardian {
*/
static final class RaftLogSummary {
- /** Whether the path denotes an open segment under active writing progress
*/
- private static final Predicate<Path> isOpenSegment =
- p -> p.toFile().getName().startsWith("log_inprogress");
+ /** Open and closed log segment names, following Ratis' naming convention.
*/
+ private static final Pattern LOG_SEGMENT_PATTERN =
+ Pattern.compile("log_(?:\\d+-\\d+|inprogress_\\d+(?:\\..*)?)");
private final RaftGroupId gid;
private final File raftLogStorageRoot;
private long totalSize;
private Set<Path> logFiles;
- private RaftLogSummary(RaftGroupId gid, File raftLogStorageRoot) {
+ RaftLogSummary(RaftGroupId gid, File raftLogStorageRoot) {
this.gid = gid;
this.raftLogStorageRoot = raftLogStorageRoot;
this.totalSize = 0;
@@ -91,8 +92,12 @@ class DiskGuardian {
void updateNow() {
try (final Stream<Path> files = Files.list(raftLogStorageRoot.toPath()))
{
- final Set<Path> latest =
files.filter(isOpenSegment).collect(Collectors.toSet());
- this.totalSize += diff(logFiles, latest);
+ final Set<Path> latest =
+ files
+ .filter(p ->
LOG_SEGMENT_PATTERN.matcher(p.getFileName().toString()).matches())
+ .collect(Collectors.toSet());
+ // An open segment can grow or be recreated under the same path
between scans.
+ this.totalSize = latest.stream().mapToLong(p ->
p.toFile().length()).sum();
this.logFiles = latest;
} catch (IOException e) {
// keep the files unchanged
@@ -100,16 +105,6 @@ class DiskGuardian {
}
}
- private static long diff(Set<Path> old, Set<Path> latest) {
- final long incremental = totalSize(latest.stream().filter(p ->
!old.contains(p)));
- final long decremental = totalSize(old.stream().filter(p ->
!latest.contains(p)));
- return incremental - decremental;
- }
-
- private static long totalSize(Stream<Path> files) {
- return files.mapToLong(p -> p.toFile().length()).sum();
- }
-
@Override
public String toString() {
return String.format(
diff --git
a/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/ratis/RaftLogSummaryTest.java
b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/ratis/RaftLogSummaryTest.java
new file mode 100644
index 00000000000..c9316cba3ab
--- /dev/null
+++
b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/ratis/RaftLogSummaryTest.java
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.consensus.ratis;
+
+import org.apache.ratis.protocol.RaftGroupId;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.nio.file.Files;
+
+import static org.junit.Assert.assertEquals;
+
+public class RaftLogSummaryTest {
+
+ @Rule public final TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+ @Test
+ public void testOpenSegmentSizeChanges() throws IOException {
+ final DiskGuardian.RaftLogSummary summary =
+ new DiskGuardian.RaftLogSummary(RaftGroupId.randomId(),
temporaryFolder.getRoot());
+ final File log = temporaryFolder.newFile("log_inprogress_0");
+ summary.updateNow();
+ assertEquals(0, summary.getTotalSize());
+
+ setLength(log, 4 * 1024 * 1024);
+ summary.updateNow();
+ assertEquals(4 * 1024 * 1024, summary.getTotalSize());
+
+ setLength(log, 8 * 1024 * 1024);
+ summary.updateNow();
+ assertEquals(8 * 1024 * 1024, summary.getTotalSize());
+
+ setLength(log, 128);
+ summary.updateNow();
+ assertEquals(128, summary.getTotalSize());
+ }
+
+ @Test
+ public void testRecreatedSegmentAtSamePath() throws IOException {
+ final DiskGuardian.RaftLogSummary summary =
+ new DiskGuardian.RaftLogSummary(RaftGroupId.randomId(),
temporaryFolder.getRoot());
+ final File log = temporaryFolder.newFile("log_inprogress_0");
+ summary.updateNow();
+ assertEquals(0, summary.getTotalSize());
+
+ Files.delete(log.toPath());
+ setLength(log, 256);
+ summary.updateNow();
+ assertEquals(256, summary.getTotalSize());
+ }
+
+ @Test
+ public void testSegmentRotationAndDeletion() throws IOException {
+ final DiskGuardian.RaftLogSummary summary =
+ new DiskGuardian.RaftLogSummary(RaftGroupId.randomId(),
temporaryFolder.getRoot());
+ final File closed = temporaryFolder.newFile("log_0-9");
+ final File open = temporaryFolder.newFile("log_inprogress_10");
+ setLength(closed, 8);
+ setLength(open, 32);
+ setLength(temporaryFolder.newFile("raft-meta"), 1024);
+ setLength(temporaryFolder.newFile("log_not_a_segment"), 1024);
+ summary.updateNow();
+ assertEquals(40, summary.getTotalSize());
+
+ final File rotated = new File(temporaryFolder.getRoot(), "log_10-19");
+ Files.move(open.toPath(), rotated.toPath());
+ final File next = temporaryFolder.newFile("log_inprogress_20");
+ setLength(next, 16);
+ summary.updateNow();
+ assertEquals(56, summary.getTotalSize());
+
+ Files.delete(closed.toPath());
+ summary.updateNow();
+ assertEquals(48, summary.getTotalSize());
+
+ Files.delete(rotated.toPath());
+ Files.delete(next.toPath());
+ summary.updateNow();
+ assertEquals(0, summary.getTotalSize());
+ }
+
+ private static void setLength(File file, long length) throws IOException {
+ try (RandomAccessFile writer = new RandomAccessFile(file, "rw")) {
+ writer.setLength(length);
+ }
+ }
+}
