Skip to content

Fix TSAN bug by swapping ForkJoinPool with ScheduledExecutorService #39556

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

Closed
sjvanrossum wants to merge 1 commit into from
+10 −1
Closed

Fix TSAN bug by swapping ForkJoinPool with ScheduledExecutorService #39556

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
11 changes: 10 additions & 1 deletion sdks/java/core/src/main/java/org/apache/beam/sdk/io/WriteFiles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadLocalRandom;
import org.apache.beam.sdk.annotations.Internal;
import org.apache.beam.sdk.coders.CannotProvideCoderException;
Expand All @@ -46,6 +47,7 @@
import org.apache.beam.sdk.io.FileBasedSink.WriteOperation;
import org.apache.beam.sdk.io.FileBasedSink.Writer;
import org.apache.beam.sdk.io.fs.ResourceId;
import org.apache.beam.sdk.options.ExecutorOptions;
import org.apache.beam.sdk.options.PipelineOptions;
import org.apache.beam.sdk.options.ValueProvider;
import org.apache.beam.sdk.options.ValueProvider.StaticValueProvider;
Expand Down Expand Up @@ -1199,6 +1201,7 @@ public WriteShardsIntoTempFilesFn(Coder<UserT> inputCoder) {
private transient List<CompletionStage<Void>> closeFutures = new ArrayList<>();
private transient List<KV<Instant, FileResult<DestinationT>>> deferredOutput =
new ArrayList<>();
private transient ScheduledExecutorService executorService;

// Ensure that transient fields are initialized.
private void readObject(java.io.ObjectInputStream in)
Expand All @@ -1208,6 +1211,11 @@ private void readObject(java.io.ObjectInputStream in)
deferredOutput = new ArrayList<>();
}

@Setup
public void setup(PipelineOptions options) {
executorService = options.as(ExecutorOptions.class).getScheduledExecutorService();
}

@ProcessElement
public void processElement(
ProcessContext c, BoundedWindow window, MultiOutputReceiver outputReceiver)
Expand Down Expand Up @@ -1285,7 +1293,8 @@ private void closeWriterInBackground(Writer<DestinationT, OutputT> writer) {
writer.cleanup();
throw e;
}
}));
},
executorService));
}

@FinishBundle
Expand Down
Loading