Skip to content

[cherry-pick] clean the PTransformOverrideRegistrar when pipeline finishes. #13

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
xinyuiscool merged 1 commit into from
Sep 15, 2021
Merged

[cherry-pick] clean the PTransformOverrideRegistrar when pipeline finishes. #13

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
8 changes: 7 additions & 1 deletion runners/samza/src/main/java/org/apache/beam/runners/samza/SamzaPipelineResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.PipelineResult;
import org.apache.beam.sdk.metrics.MetricResults;
import org.apache.beam.sdk.transforms.PTransformOverrideRegistrar;
import org.apache.beam.sdk.util.UserCodeException;
import org.apache.samza.application.StreamApplication;
import org.apache.samza.config.Config;
Expand Down Expand Up @@ -105,7 +106,12 @@ public State waitUntilFinish(@Nullable Duration duration) {

@Override
public State waitUntilFinish() {
return waitUntilFinish(null);
// LI-specific: clear the PTransformOverrideRegistrar when pipeline is terminal.
PipelineResult.State pipelineResult = waitUntilFinish(null);
if (pipelineResult.isTerminal()) {
PTransformOverrideRegistrar.clear();
}
return pipelineResult;
}

@Override
Expand Down
8 changes: 7 additions & 1 deletion runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.PipelineResult;
import org.apache.beam.sdk.metrics.MetricResults;
import org.apache.beam.sdk.transforms.PTransformOverrideRegistrar;
import org.apache.beam.sdk.util.UserCodeException;
import org.apache.spark.SparkException;
import org.apache.spark.api.java.JavaSparkContext;
Expand Down Expand Up @@ -89,7 +90,12 @@ public PipelineResult.State getState() {

@Override
public PipelineResult.State waitUntilFinish() {
return waitUntilFinish(Duration.millis(-1));
// LI-specific: clear the PTransformOverrideRegistrar when pipeline is terminal.
PipelineResult.State pipelineResult = waitUntilFinish(Duration.millis(-1));
if (pipelineResult.isTerminal()) {
PTransformOverrideRegistrar.clear();
}
return pipelineResult;
}

@Override
Expand Down