You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by bh...@apache.org on 2021/11/19 15:49:22 UTC
[beam] branch master updated: [BEAM-13290] Handle disable_prime_runner_v2 flag (#16018)
This is an automated email from the ASF dual-hosted git repository.
bhulette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new c2af5c4 [BEAM-13290] Handle disable_prime_runner_v2 flag (#16018)
c2af5c4 is described below
commit c2af5c455ed98a34d0828069e73f674bdb85857a
Author: Brian Hulette <bh...@google.com>
AuthorDate: Fri Nov 19 07:48:15 2021 -0800
[BEAM-13290] Handle disable_prime_runner_v2 flag (#16018)
---
.../src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
index 4b1d022..962f790 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
@@ -2304,7 +2304,8 @@ public class DataflowRunner extends PipelineRunner<DataflowPipelineJob> {
return hasExperiment(options, "beam_fn_api")
|| hasExperiment(options, "use_runner_v2")
|| hasExperiment(options, "use_unified_worker")
- || hasExperiment(options, "enable_prime");
+ || (hasExperiment(options, "enable_prime")
+ && !hasExperiment(options, "disable_prime_runner_v2"));
}
static boolean useStreamingEngine(DataflowPipelineOptions options) {