Skip to content

fix(inkless:consume): handle error path in lastOffsetForLeaderEpoch #554

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
viktorsomogyi merged 1 commit into from
Mar 30, 2026
Merged

fix(inkless:consume): handle error path in lastOffsetForLeaderEpoch #554

Show file tree
Hide file tree
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
14 changes: 10 additions & 4 deletions core/src/main/scala/kafka/server/ReplicaManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import org.apache.kafka.common.message.ListOffsetsRequestData.{ListOffsetsPartit
import org.apache.kafka.common.message.ListOffsetsResponseData.{ListOffsetsPartitionResponse, ListOffsetsTopicResponse}
import org.apache.kafka.common.message.OffsetForLeaderEpochRequestData.OffsetForLeaderTopic
import org.apache.kafka.common.message.OffsetForLeaderEpochResponseData.{EpochEndOffset, OffsetForLeaderTopicResult}
import org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse
import org.apache.kafka.common.message.{DescribeLogDirsResponseData, DescribeProducersResponseData}
import org.apache.kafka.common.metrics.Metrics
import org.apache.kafka.common.network.ListenerName
Expand Down Expand Up @@ -2586,14 +2587,19 @@ class ReplicaManager(val config: KafkaConfig,
inklessFetchOffsetHandlerJob.get
.add(tp, partitionRequest)
.thenApply[EpochEndOffset](epochEndOffset => {
val endOffset = epochEndOffset.timestampAndOffset().get().offset
val errorCode = epochEndOffset.exception()
val error = epochEndOffset.exception()
.map[Errors](e => Errors.forException(e))
.orElse(Errors.NONE)
.code
if (error != Errors.NONE) {
warn(s"Error fetching offset for leader epoch from control plane for $tp: $error",
epochEndOffset.exception().orElse(null))
Comment thread
jeqo marked this conversation as resolved.
}
val endOffset = epochEndOffset.timestampAndOffset()
.map[Long](_.offset)
.orElse(OffsetsForLeaderEpochResponse.UNDEFINED_EPOCH_OFFSET)
new EpochEndOffset()
.setPartition(tp.partition())
.setErrorCode(errorCode)
.setErrorCode(error.code)
.setLeaderEpoch(leaderEpoch)
.setEndOffset(endOffset)
})
Expand Down
54 changes: 50 additions & 4 deletions core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package kafka.server
import com.yammer.metrics.core.{Gauge, Meter, Timer}
import io.aiven.inkless.common.SharedState
import io.aiven.inkless.config.InklessConfig
import io.aiven.inkless.consume.FetchHandler
import io.aiven.inkless.consume.{FetchHandler, FetchOffsetHandler}
import io.aiven.inkless.control_plane.{BatchInfo, BatchMetadata, ControlPlane, ControlPlaneException, FindBatchResponse}
import kafka.server.metadata.InklessMetadataView
import io.aiven.inkless.produce.AppendHandler
Expand All @@ -40,9 +40,10 @@ import org.apache.kafka.clients.consumer.ShareAcquireMode
import org.apache.kafka.common.{DirectoryId, IsolationLevel, Node, TopicIdPartition, TopicPartition, Uuid}
import org.apache.kafka.common.compress.Compression
import org.apache.kafka.common.config.TopicConfig
import org.apache.kafka.common.errors.InvalidPidMappingException
import org.apache.kafka.common.errors.{InvalidPidMappingException, UnknownTopicOrPartitionException}
import org.apache.kafka.common.internals.Topic
import org.apache.kafka.common.message.{DeleteRecordsResponseData, FetchResponseData, ShareFetchResponseData}
import org.apache.kafka.common.message.OffsetForLeaderEpochRequestData.{OffsetForLeaderPartition, OffsetForLeaderTopic}
import org.apache.kafka.common.message.OffsetForLeaderEpochResponseData.EpochEndOffset
import org.apache.kafka.common.metadata.{PartitionChangeRecord, PartitionRecord, RemoveTopicRecord, TopicRecord}
import org.apache.kafka.common.metrics.Metrics
Expand Down Expand Up @@ -83,7 +84,7 @@ import org.apache.kafka.server.util.timer.{MockTimer, SystemTimer}
import org.apache.kafka.server.util.{MockScheduler, MockTime, Scheduler}
import org.apache.kafka.storage.internals.checkpoint.LazyOffsetCheckpoints
import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache
import org.apache.kafka.storage.internals.log.{AppendOrigin, CleanerConfig, FetchDataInfo, LocalLog, LogAppendInfo, LogConfig, LogDirFailureChannel, LogLoader, LogOffsetMetadata, LogOffsetSnapshot, LogOffsetsListener, LogReadResult, LogSegments, ProducerStateManager, ProducerStateManagerConfig, RemoteLogReadResult, RemoteStorageFetchInfo, UnifiedLog, VerificationGuard}
import org.apache.kafka.storage.internals.log.{AppendOrigin, CleanerConfig, FetchDataInfo, LocalLog, LogAppendInfo, LogConfig, LogDirFailureChannel, LogLoader, LogOffsetMetadata, LogOffsetSnapshot, LogOffsetsListener, LogReadResult, LogSegments, OffsetResultHolder, ProducerStateManager, ProducerStateManagerConfig, RemoteLogReadResult, RemoteStorageFetchInfo, UnifiedLog, VerificationGuard}
import org.apache.kafka.storage.log.metrics.BrokerTopicStats
import org.junit.jupiter.api.Assertions._
import org.junit.jupiter.api.{AfterAll, AfterEach, BeforeEach, Nested, Test}
Expand All @@ -93,7 +94,7 @@ import org.mockito.ArgumentMatchers._
import org.mockito.Mockito._
import org.mockito.invocation.InvocationOnMock
import org.mockito.stubbing.Answer
import org.mockito.{Answers, ArgumentCaptor, ArgumentMatchers, MockedConstruction}
import org.mockito.{Answers, ArgumentCaptor, ArgumentMatchers, MockedConstruction, Mockito}

import java.io.{ByteArrayInputStream, File}
import java.net.InetAddress
Expand Down Expand Up @@ -6861,6 +6862,51 @@ class ReplicaManagerTest {

// TODO: Add more fetch tests combinations, edge cases ara not covered yet.

@Test
def testLastOffsetForLeaderEpochDisklessWithControlPlaneError(): Unit = {
val errorResult = new OffsetResultHolder.FileRecordsOrError(
Optional.of(new UnknownTopicOrPartitionException("not found")),
Optional.empty()
)

val jobMock = Mockito.mock(classOf[FetchOffsetHandler.Job])
when(jobMock.mustHandle(any())).thenReturn(true)
when(jobMock.add(any(), any())).thenReturn(CompletableFuture.completedFuture(errorResult))
doNothing().when(jobMock).start()

val fetchOffsetHandlerCtorInit: MockedConstruction.MockInitializer[FetchOffsetHandler] = {
case (handlerMock, _) =>
when(handlerMock.createJob()).thenReturn(jobMock)
}
val fetchOffsetHandlerCtor = mockConstruction(classOf[FetchOffsetHandler], fetchOffsetHandlerCtorInit)

val replicaManager = try {
createReplicaManager(List(disklessTopicPartition.topic()))
} finally {
fetchOffsetHandlerCtor.close()
}

val requestedEpochInfo = Seq(
new OffsetForLeaderTopic()
.setTopic(disklessTopicPartition.topic())
.setPartitions(util.List.of(
new OffsetForLeaderPartition()
.setPartition(disklessTopicPartition.partition())
.setLeaderEpoch(0)
))
)

val result = replicaManager.lastOffsetForLeaderEpoch(requestedEpochInfo)

assertEquals(1, result.size)
val topicResult = result.head
assertEquals(disklessTopicPartition.topic(), topicResult.topic())
assertEquals(1, topicResult.partitions().size())
val partitionResult = topicResult.partitions().get(0)
assertEquals(Errors.UNKNOWN_TOPIC_OR_PARTITION.code, partitionResult.errorCode())
assertEquals(OffsetsForLeaderEpochResponse.UNDEFINED_EPOCH_OFFSET, partitionResult.endOffset())
}

private def mockFetchHandler(disklessResponse: Map[TopicIdPartition, FetchPartitionData]) = {
// We use constructor mocking here to inject a FetchHandler mock into ReplicaManager,
// because ReplicaManager internally constructs its own FetchHandler instance and does not
Expand Down
Loading