Skip to content

KAFKA-13098: Fix NoSuchFileException during snapshot recovery #11071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmccabe merged 1 commit into from
Jul 16, 2021
+10 −12
Merged

KAFKA-13098: Fix NoSuchFileException during snapshot recovery #11071

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions core/src/main/scala/kafka/raft/KafkaMetadataLog.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import org.apache.kafka.common.record.{ControlRecordUtils, MemoryRecords, Record
import org.apache.kafka.common.utils.{BufferSupplier, Time}
import org.apache.kafka.common.{KafkaException, TopicPartition, Uuid}
import org.apache.kafka.raft.{Isolation, KafkaRaftClient, LogAppendInfo, LogFetchInfo, LogOffsetMetadata, OffsetAndEpoch, OffsetMetadata, ReplicatedLog, ValidOffsetAndEpoch}
import org.apache.kafka.snapshot.{FileRawSnapshotReader, FileRawSnapshotWriter, RawSnapshotReader, RawSnapshotWriter, SnapshotPath, Snapshots}
import org.apache.kafka.snapshot.{FileRawSnapshotReader, FileRawSnapshotWriter, RawSnapshotReader, RawSnapshotWriter, Snapshots}

import java.io.File
import java.nio.file.{Files, NoSuchFileException, Path}
Expand Down Expand Up @@ -604,17 +604,11 @@ object KafkaMetadataLog {
val snapshots = mutable.TreeMap.empty[OffsetAndEpoch, Option[FileRawSnapshotReader]]
// Scan the log directory; deleting partial snapshots and older snapshot, only remembering immutable snapshots start
// from logStartOffset
Files
.walk(log.dir.toPath, 1)
.map[Optional[SnapshotPath]] { path =>
if (path != log.dir.toPath) {
Snapshots.parse(path)
} else {
Optional.empty()
}
}
.forEach { path =>
path.ifPresent { snapshotPath =>
val filesInDir = Files.newDirectoryStream(log.dir.toPath)

try {
filesInDir.forEach { path =>
Snapshots.parse(path).ifPresent { snapshotPath =>
if (snapshotPath.partial ||
snapshotPath.deleted ||
snapshotPath.snapshotId.offset < log.logStartOffset) {
Expand All @@ -625,6 +619,10 @@ object KafkaMetadataLog {
}
}
}
} finally {
filesInDir.close()
}

snapshots
}

Expand Down