-
Notifications
You must be signed in to change notification settings - Fork 124
fix(amber): surface writer-thread failure as FatalError instead of silent hang #4683
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.
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
Yicong-Huang
merged 3 commits into
apache:main
from
Yicong-Huang:fix/iceberg-write-fatal-fallback
May 6, 2026
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
151 changes: 151 additions & 0 deletions
151
...e/texera/amber/engine/architecture/worker/managers/OutputPortResultWriterThreadSpec.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| /* | ||
| * 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.texera.amber.engine.architecture.worker.managers | ||
|
|
||
| import org.apache.texera.amber.core.storage.model.BufferedItemWriter | ||
| import org.apache.texera.amber.core.tuple.Tuple | ||
| import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity | ||
| import org.apache.texera.amber.core.workflow.PortIdentity | ||
| import org.apache.texera.amber.engine.architecture.messaginglayer.{ | ||
| NetworkOutputGateway, | ||
| OutputManager | ||
| } | ||
| import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage | ||
| import org.scalatest.flatspec.AnyFlatSpec | ||
|
|
||
| import scala.collection.mutable | ||
|
|
||
| class OutputPortResultWriterThreadSpec extends AnyFlatSpec { | ||
|
|
||
| private class StubWriter( | ||
| onPutOne: () => Unit = () => (), | ||
| onClose: () => Unit = () => () | ||
| ) extends BufferedItemWriter[Tuple] { | ||
| val bufferSize: Int = 1024 | ||
| var closeCalled = false | ||
| def open(): Unit = () | ||
| def putOne(item: Tuple): Unit = onPutOne() | ||
| def removeOne(item: Tuple): Unit = () | ||
| def close(): Unit = { | ||
| closeCalled = true | ||
| onClose() | ||
| } | ||
| } | ||
|
|
||
| private def throwing(msg: String): () => Unit = () => throw new RuntimeException(msg) | ||
|
|
||
| "OutputPortResultWriterThread" should "leave getFailure empty on a clean run" in { | ||
| val writer = new StubWriter() | ||
| val thread = new OutputPortResultWriterThread(writer) | ||
| thread.start() | ||
| thread.queue.put(Right(PortStorageWriterTerminateSignal)) | ||
| thread.join() | ||
| assert(thread.getFailure.isEmpty) | ||
| assert(writer.closeCalled) | ||
| } | ||
|
|
||
| it should "capture a close() exception in getFailure so the worker can re-throw" in { | ||
|
Yicong-Huang marked this conversation as resolved.
|
||
| val writer = new StubWriter(onClose = throwing("test close failure")) | ||
| val thread = new OutputPortResultWriterThread(writer) | ||
| thread.start() | ||
| thread.queue.put(Right(PortStorageWriterTerminateSignal)) | ||
| thread.join() | ||
| assert(thread.getFailure.exists(_.getMessage.contains("test close failure"))) | ||
| assert(writer.closeCalled) | ||
| } | ||
|
|
||
| it should "capture a putOne exception and still call close()" in { | ||
| val writer = new StubWriter(onPutOne = throwing("test putOne failure")) | ||
| val thread = new OutputPortResultWriterThread(writer) | ||
| thread.start() | ||
| thread.queue.put(Left(null.asInstanceOf[Tuple])) | ||
| thread.queue.put(Right(PortStorageWriterTerminateSignal)) | ||
| thread.join() | ||
| assert(thread.getFailure.exists(_.getMessage.contains("test putOne failure"))) | ||
| // The finally clause must run close() even after putOne threw, or | ||
| // the underlying writer leaks file handles. | ||
| assert(writer.closeCalled) | ||
| } | ||
|
|
||
| it should "preserve both errors when putOne and close() fail in the same run" in { | ||
| val writer = new StubWriter( | ||
| onPutOne = throwing("test putOne failure"), | ||
| onClose = throwing("test close failure") | ||
| ) | ||
| val thread = new OutputPortResultWriterThread(writer) | ||
| thread.start() | ||
| thread.queue.put(Left(null.asInstanceOf[Tuple])) | ||
| thread.queue.put(Right(PortStorageWriterTerminateSignal)) | ||
| thread.join() | ||
| val captured = thread.getFailure.getOrElse(fail("expected putOne failure")) | ||
| assert(captured.getMessage.contains("test putOne failure")) | ||
| assert( | ||
| captured.getSuppressed.exists(_.getMessage.contains("test close failure")), | ||
| "close() failure should be attached as suppressed on the original putOne failure" | ||
| ) | ||
| } | ||
|
|
||
| // Reach into OutputManager's private outputPortResultWriterThreads map to | ||
| // install a writer thread whose close() has already failed. This pins the | ||
| // contract that closeOutputStorageWriterIfNeeded re-throws the captured | ||
| // failure, which is the bridge from the writer thread to the DP thread → | ||
| // worker actor → controller supervisor → FatalError to client. | ||
| private def installWriterThread( | ||
| manager: OutputManager, | ||
| portId: PortIdentity, | ||
| thread: OutputPortResultWriterThread | ||
| ): Unit = { | ||
| val field = classOf[OutputManager] | ||
| .getDeclaredField("outputPortResultWriterThreads") | ||
| field.setAccessible(true) | ||
| field | ||
| .get(manager) | ||
| .asInstanceOf[mutable.HashMap[PortIdentity, OutputPortResultWriterThread]] | ||
| .put(portId, thread) | ||
| } | ||
|
|
||
| "OutputManager.closeOutputStorageWriterIfNeeded" should | ||
| "re-throw the writer thread's captured failure" in { | ||
| val identifier = ActorVirtualIdentity("test-worker") | ||
| val outputManager = new OutputManager( | ||
| identifier, | ||
| new NetworkOutputGateway(identifier, (_: WorkflowFIFOMessage) => ()) | ||
| ) | ||
| val portId = PortIdentity() | ||
| val failingWriter = new StubWriter(onClose = throwing("test close failure")) | ||
| val failingThread = new OutputPortResultWriterThread(failingWriter) | ||
| failingThread.start() | ||
| installWriterThread(outputManager, portId, failingThread) | ||
| val ex = intercept[RuntimeException] { | ||
| outputManager.closeOutputStorageWriterIfNeeded(portId) | ||
| } | ||
| assert(ex.getMessage.contains("test close failure")) | ||
| } | ||
|
|
||
| it should "be a no-op when the port has no writer thread" in { | ||
| val identifier = ActorVirtualIdentity("test-worker") | ||
| val outputManager = new OutputManager( | ||
| identifier, | ||
| new NetworkOutputGateway(identifier, (_: WorkflowFIFOMessage) => ()) | ||
| ) | ||
| // No installWriterThread call — the port has never had a writer. | ||
| outputManager.closeOutputStorageWriterIfNeeded(PortIdentity()) | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.