swuferhong commented on code in PR #1749:
URL: https://github.com/apache/fluss/pull/1749#discussion_r2378425872
##########
fluss-server/src/main/java/org/apache/fluss/server/log/LogLoader.java:
##########
@@ -117,6 +122,37 @@ public LoadedLogOffsets load() throws IOException {
nextOffset, activeSegment.getBaseOffset(),
activeSegment.getSizeInBytes()));
}
+ /**
+ * Just recovers the given segment, without adding it to the provided
segments.
+ *
+ * @param segment Segment to recover
+ * @return The number of bytes truncated from the segment
+ * @throws LogSegmentOffsetOverflowException if the segment contains
messages that cause index
+ * offset overflow
+ */
+ private int recoverSegment(LogSegment segment) throws Exception {
+ WriterStateManager writerStateManager =
+ new WriterStateManager(
+ logSegments.getTableBucket(),
+ logTabletDir,
+ this.writerStateManager.writerExpirationMs());
Review Comment:
Why we need to new a WriterStateManager? Maybe we can add a clear() method?
##########
fluss-server/src/test/java/org/apache/fluss/server/log/LogLoaderTest.java:
##########
@@ -0,0 +1,206 @@
+/*
+ * 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.fluss.server.log;
+
+import org.apache.fluss.compression.ArrowCompressionInfo;
+import org.apache.fluss.config.ConfigOptions;
+import org.apache.fluss.config.MemorySize;
+import org.apache.fluss.metadata.LogFormat;
+import org.apache.fluss.metadata.PhysicalTablePath;
+import org.apache.fluss.record.ChangeType;
+import org.apache.fluss.record.LogTestBase;
+import org.apache.fluss.record.MemoryLogRecords;
+import org.apache.fluss.server.exception.CorruptIndexException;
+import org.apache.fluss.server.metrics.group.TestingMetricGroups;
+import org.apache.fluss.utils.clock.Clock;
+import org.apache.fluss.utils.clock.ManualClock;
+import org.apache.fluss.utils.clock.SystemClock;
+import org.apache.fluss.utils.concurrent.FlussScheduler;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.apache.fluss.record.TestData.DATA1_ROW_TYPE;
+import static org.apache.fluss.record.TestData.DATA1_TABLE_ID;
+import static org.apache.fluss.record.TestData.DATA1_TABLE_PATH;
+import static org.apache.fluss.record.TestData.DEFAULT_SCHEMA_ID;
+import static
org.apache.fluss.testutils.DataTestUtils.createBasicMemoryLogRecords;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+/** Test for {@link LogLoader}. */
+final class LogLoaderTest extends LogTestBase {
+
+ private @TempDir File tempDir;
+ private FlussScheduler scheduler;
+ private File logDir;
+ private Clock clock;
+
+ @BeforeEach
+ public void setup() throws Exception {
+ conf.set(ConfigOptions.LOG_SEGMENT_FILE_SIZE, MemorySize.parse("1kb"));
+ conf.set(ConfigOptions.LOG_INDEX_INTERVAL_SIZE,
MemorySize.parse("1b"));
+
+ logDir =
+ LogTestUtils.makeRandomLogTabletDir(
+ tempDir,
+ DATA1_TABLE_PATH.getDatabaseName(),
+ DATA1_TABLE_ID,
+ DATA1_TABLE_PATH.getTableName());
+
+ scheduler = new FlussScheduler(1);
+ scheduler.startup();
+
+ clock = new ManualClock();
+ }
+
+ // TODO: add more tests like Kafka LogLoaderTest
+
+ @Test
+ void testCorruptIndexRebuild() throws Exception {
+ // publish the records and close the log
+ int numRecords = 200;
+ LogTablet logTablet = createLogTablet(true);
+ appendRecords(logTablet, numRecords);
+ // collect all the index files
+ List<File> indexFiles = collectIndexFiles(logTablet);
+ logTablet.close();
+
+ // corrupt all the index files
+ for (File indexFile : indexFiles) {
+ try (FileChannel fileChannel =
+ FileChannel.open(indexFile.toPath(),
StandardOpenOption.APPEND)) {
+ fileChannel.write(ByteBuffer.wrap(new byte[] {0}));
+ }
+ }
+
+ // test reopen the log without recovery, sanity check of index files
should throw exception
+ logTablet = createLogTablet(true);
+ for (LogSegment segment : logTablet.logSegments()) {
+ if (segment.getBaseOffset() !=
logTablet.activeLogSegment().getBaseOffset()) {
+ assertThatThrownBy(segment.offsetIndex()::sanityCheck)
+ .isInstanceOf(CorruptIndexException.class);
+ assertThatThrownBy(segment.timeIndex()::sanityCheck)
+ .isInstanceOf(CorruptIndexException.class);
+ }
+ }
+ logTablet.close();
+
+ // test reopen the log with recovery, sanity check of index files
should no corruption
+ logTablet = createLogTablet(false);
+ for (LogSegment segment : logTablet.logSegments()) {
+ segment.offsetIndex().sanityCheck();
+ segment.timeIndex().sanityCheck();
+ }
+ assertThat(numRecords).isEqualTo(logTablet.localLogEndOffset());
+ for (int i = 0; i < numRecords; i++) {
+ assertThat(i)
+
.isEqualTo(logTablet.lookupOffsetForTimestamp(clock.milliseconds() + i * 10));
+ }
+ logTablet.close();
+ }
+
+ @Test
+ void testIndexRebuild() throws Exception {
+ // publish the records and close the log
+ int numRecords = 200;
+ LogTablet logTablet = createLogTablet(true);
+ appendRecords(logTablet, numRecords);
+ // collect all index files
+ List<File> indexFiles = collectIndexFiles(logTablet);
+ logTablet.close();
+
+ // delete all the index files
+ indexFiles.forEach(File::delete);
+
+ // reopen the log
+ logTablet = createLogTablet(false);
+ assertThat(logTablet.localLogEndOffset()).isEqualTo(numRecords);
+ // the index files should be rebuilt
+ assertThat(logTablet.logSegments().get(0).offsetIndex().entries() >
0).isTrue();
+ assertThat(logTablet.logSegments().get(0).timeIndex().entries() >
0).isTrue();
+ for (int i = 0; i < numRecords; i++) {
+ assertThat(i)
+
.isEqualTo(logTablet.lookupOffsetForTimestamp(clock.milliseconds() + i * 10));
+ }
+ logTablet.close();
+ }
+
+ private LogTablet createLogTablet(boolean isCleanShutdown) throws
Exception {
+ return LogTablet.create(
+ PhysicalTablePath.of(DATA1_TABLE_PATH),
+ logDir,
+ conf,
+ TestingMetricGroups.TABLET_SERVER_METRICS,
+ 0,
+ scheduler,
+ LogFormat.ARROW,
+ 1,
+ false,
+ SystemClock.getInstance(),
+ isCleanShutdown);
+ }
+
+ private void appendRecords(LogTablet logTablet, int numRecords) throws
Exception {
+ int baseOffset = 0;
+ int batchSequence = 0;
+ for (int i = 0; i < numRecords; i++) {
+ List<Object[]> objects = Collections.singletonList(new Object[]
{1, "a"});
+ List<ChangeType> changeTypes =
+ objects.stream()
+ .map(row -> ChangeType.APPEND_ONLY)
+ .collect(Collectors.toList());
+ MemoryLogRecords memoryLogRecords =
+ createBasicMemoryLogRecords(
+ DATA1_ROW_TYPE,
+ DEFAULT_SCHEMA_ID,
+ baseOffset,
+ clock.milliseconds() + i * 10L,
+ magic,
+ System.currentTimeMillis(),
+ batchSequence,
+ changeTypes,
+ objects,
+ LogFormat.ARROW,
+ ArrowCompressionInfo.DEFAULT_COMPRESSION);
+ logTablet.appendAsFollower(memoryLogRecords);
+ baseOffset++;
+ batchSequence++;
+ }
+ }
+
Review Comment:
Can you add a test to verify the `recoverySegment()` only recovery the
`logSegments` generated after `recoveryPointCheckpoint`. It appears that the
logic related to `recoveryPointCheckpoint` has not been covered.
##########
fluss-server/src/main/java/org/apache/fluss/server/log/LogLoader.java:
##########
@@ -129,16 +165,106 @@ public LoadedLogOffsets load() throws IOException {
* overflow
*/
private Tuple2<Long, Long> recoverLog() throws IOException {
- // TODO truncate log to recover maybe unflush segments.
+ if (!isCleanShutdown) {
+ List<LogSegment> unflushed =
+ logSegments.values(recoveryPointCheckpoint,
Long.MAX_VALUE);
+ int numUnflushed = unflushed.size();
+ Iterator<LogSegment> unflushedIter = unflushed.iterator();
+ boolean truncated = false;
+ int numFlushed = 1;
+
+ while (unflushedIter.hasNext() && !truncated) {
+ LogSegment segment = unflushedIter.next();
+ LOG.info(
+ "Recovering unflushed segment {}. {}/{} recovered for
bucket {}",
+ segment.getBaseOffset(),
+ numFlushed,
+ numUnflushed,
+ logSegments.getTableBucket());
+
+ int truncatedBytes = -1;
Review Comment:
Do we need to be this too aggressive here? Deleting all `subsequent
logSegments` just because one cannot be repaired — I feel this might pose a
risk of data loss. Also, we don't have test coverage for this logic.
##########
fluss-server/src/test/java/org/apache/fluss/server/log/LogLoaderTest.java:
##########
@@ -0,0 +1,206 @@
+/*
+ * 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.fluss.server.log;
+
+import org.apache.fluss.compression.ArrowCompressionInfo;
+import org.apache.fluss.config.ConfigOptions;
+import org.apache.fluss.config.MemorySize;
+import org.apache.fluss.metadata.LogFormat;
+import org.apache.fluss.metadata.PhysicalTablePath;
+import org.apache.fluss.record.ChangeType;
+import org.apache.fluss.record.LogTestBase;
+import org.apache.fluss.record.MemoryLogRecords;
+import org.apache.fluss.server.exception.CorruptIndexException;
+import org.apache.fluss.server.metrics.group.TestingMetricGroups;
+import org.apache.fluss.utils.clock.Clock;
+import org.apache.fluss.utils.clock.ManualClock;
+import org.apache.fluss.utils.clock.SystemClock;
+import org.apache.fluss.utils.concurrent.FlussScheduler;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.apache.fluss.record.TestData.DATA1_ROW_TYPE;
+import static org.apache.fluss.record.TestData.DATA1_TABLE_ID;
+import static org.apache.fluss.record.TestData.DATA1_TABLE_PATH;
+import static org.apache.fluss.record.TestData.DEFAULT_SCHEMA_ID;
+import static
org.apache.fluss.testutils.DataTestUtils.createBasicMemoryLogRecords;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+/** Test for {@link LogLoader}. */
+final class LogLoaderTest extends LogTestBase {
+
+ private @TempDir File tempDir;
+ private FlussScheduler scheduler;
+ private File logDir;
+ private Clock clock;
+
+ @BeforeEach
+ public void setup() throws Exception {
+ conf.set(ConfigOptions.LOG_SEGMENT_FILE_SIZE, MemorySize.parse("1kb"));
+ conf.set(ConfigOptions.LOG_INDEX_INTERVAL_SIZE,
MemorySize.parse("1b"));
+
+ logDir =
+ LogTestUtils.makeRandomLogTabletDir(
+ tempDir,
+ DATA1_TABLE_PATH.getDatabaseName(),
+ DATA1_TABLE_ID,
+ DATA1_TABLE_PATH.getTableName());
+
+ scheduler = new FlussScheduler(1);
+ scheduler.startup();
+
+ clock = new ManualClock();
+ }
+
+ // TODO: add more tests like Kafka LogLoaderTest
+
+ @Test
+ void testCorruptIndexRebuild() throws Exception {
+ // publish the records and close the log
+ int numRecords = 200;
+ LogTablet logTablet = createLogTablet(true);
+ appendRecords(logTablet, numRecords);
+ // collect all the index files
+ List<File> indexFiles = collectIndexFiles(logTablet);
+ logTablet.close();
+
+ // corrupt all the index files
+ for (File indexFile : indexFiles) {
+ try (FileChannel fileChannel =
+ FileChannel.open(indexFile.toPath(),
StandardOpenOption.APPEND)) {
+ fileChannel.write(ByteBuffer.wrap(new byte[] {0}));
+ }
+ }
+
+ // test reopen the log without recovery, sanity check of index files
should throw exception
+ logTablet = createLogTablet(true);
+ for (LogSegment segment : logTablet.logSegments()) {
+ if (segment.getBaseOffset() !=
logTablet.activeLogSegment().getBaseOffset()) {
+ assertThatThrownBy(segment.offsetIndex()::sanityCheck)
Review Comment:
add exception msg.
##########
fluss-server/src/test/java/org/apache/fluss/server/log/LogLoaderTest.java:
##########
@@ -0,0 +1,206 @@
+/*
+ * 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.fluss.server.log;
+
+import org.apache.fluss.compression.ArrowCompressionInfo;
+import org.apache.fluss.config.ConfigOptions;
+import org.apache.fluss.config.MemorySize;
+import org.apache.fluss.metadata.LogFormat;
+import org.apache.fluss.metadata.PhysicalTablePath;
+import org.apache.fluss.record.ChangeType;
+import org.apache.fluss.record.LogTestBase;
+import org.apache.fluss.record.MemoryLogRecords;
+import org.apache.fluss.server.exception.CorruptIndexException;
+import org.apache.fluss.server.metrics.group.TestingMetricGroups;
+import org.apache.fluss.utils.clock.Clock;
+import org.apache.fluss.utils.clock.ManualClock;
+import org.apache.fluss.utils.clock.SystemClock;
+import org.apache.fluss.utils.concurrent.FlussScheduler;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.apache.fluss.record.TestData.DATA1_ROW_TYPE;
+import static org.apache.fluss.record.TestData.DATA1_TABLE_ID;
+import static org.apache.fluss.record.TestData.DATA1_TABLE_PATH;
+import static org.apache.fluss.record.TestData.DEFAULT_SCHEMA_ID;
+import static
org.apache.fluss.testutils.DataTestUtils.createBasicMemoryLogRecords;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+/** Test for {@link LogLoader}. */
+final class LogLoaderTest extends LogTestBase {
+
+ private @TempDir File tempDir;
+ private FlussScheduler scheduler;
+ private File logDir;
+ private Clock clock;
+
+ @BeforeEach
+ public void setup() throws Exception {
+ conf.set(ConfigOptions.LOG_SEGMENT_FILE_SIZE, MemorySize.parse("1kb"));
+ conf.set(ConfigOptions.LOG_INDEX_INTERVAL_SIZE,
MemorySize.parse("1b"));
+
+ logDir =
+ LogTestUtils.makeRandomLogTabletDir(
+ tempDir,
+ DATA1_TABLE_PATH.getDatabaseName(),
+ DATA1_TABLE_ID,
+ DATA1_TABLE_PATH.getTableName());
+
+ scheduler = new FlussScheduler(1);
+ scheduler.startup();
+
+ clock = new ManualClock();
+ }
+
+ // TODO: add more tests like Kafka LogLoaderTest
+
+ @Test
+ void testCorruptIndexRebuild() throws Exception {
+ // publish the records and close the log
+ int numRecords = 200;
+ LogTablet logTablet = createLogTablet(true);
+ appendRecords(logTablet, numRecords);
+ // collect all the index files
+ List<File> indexFiles = collectIndexFiles(logTablet);
+ logTablet.close();
+
+ // corrupt all the index files
+ for (File indexFile : indexFiles) {
+ try (FileChannel fileChannel =
+ FileChannel.open(indexFile.toPath(),
StandardOpenOption.APPEND)) {
+ fileChannel.write(ByteBuffer.wrap(new byte[] {0}));
+ }
+ }
+
+ // test reopen the log without recovery, sanity check of index files
should throw exception
+ logTablet = createLogTablet(true);
+ for (LogSegment segment : logTablet.logSegments()) {
+ if (segment.getBaseOffset() !=
logTablet.activeLogSegment().getBaseOffset()) {
+ assertThatThrownBy(segment.offsetIndex()::sanityCheck)
+ .isInstanceOf(CorruptIndexException.class);
+ assertThatThrownBy(segment.timeIndex()::sanityCheck)
Review Comment:
ditto
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
