Skip to content
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

Jump to bottom

Allow stream to be interrupted when there is no traffic #1251

Merged
merged 2 commits into from
Jun 10, 2024
Merged

Allow stream to be interrupted when there is no traffic #1251

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b16bbd
Allow stream to be interrupted when there is no traffic
erikvanoosten Jun 7, 2024
1a8a9fc
More type safety
erikvanoosten Jun 8, 2024
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
12 changes: 7 additions & 5 deletions zio-kafka/src/main/scala/zio/kafka/consumer/internal/PartitionStreamControl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ final class PartitionStreamControl private (
val tp: TopicPartition,
stream: ZStream[Any, Throwable, ByteArrayCommittableRecord],
dataQueue: Queue[Take[Throwable, ByteArrayCommittableRecord]],
interruptionPromise: Promise[Throwable, Unit],
interruptionPromise: Promise[Throwable, Nothing],
val completedPromise: Promise[Nothing, Option[Offset]],
queueInfoRef: Ref[QueueInfo],
maxPollInterval: Duration
Expand Down Expand Up @@ -135,16 +135,18 @@ object PartitionStreamControl {

for {
_ <- ZIO.logDebug(s"Creating partition stream ${tp.toString}")
interruptionPromise <- Promise.make[Throwable, Unit]
interruptionPromise <- Promise.make[Throwable, Nothing]
completedPromise <- Promise.make[Nothing, Option[Offset]]
dataQueue <- Queue.unbounded[Take[Throwable, ByteArrayCommittableRecord]]
now <- Clock.nanoTime
queueInfo <- Ref.make(QueueInfo(now, 0, None, 0))
requestAndAwaitData =
for {
_ <- commandQueue.offer(RunloopCommand.Request(tp))
_ <- diagnostics.emit(DiagnosticEvent.Request(tp))
taken <- dataQueue.takeBetween(1, Int.MaxValue)
_ <- commandQueue.offer(RunloopCommand.Request(tp))
_ <- diagnostics.emit(DiagnosticEvent.Request(tp))
taken <- dataQueue
erikvanoosten marked this conversation as resolved.
Show resolved Hide resolved
.takeBetween(1, Int.MaxValue)
.race(interruptionPromise.await)
} yield taken

stream = ZStream.logAnnotate(
Expand Down
Loading