From 63fd63cbcc17ffa76e36fc045b25a4bfaa64c3b9 Mon Sep 17 00:00:00 2001 From: Yichi Zhang Date: Tue, 29 Mar 2022 15:19:55 -0700 Subject: [PATCH] Add --dataflowServiceOptions=enable_prime to useUnifiedWorker conditions --- .../java/org/apache/beam/runners/dataflow/DataflowRunner.java | 4 +++- 1 file changed, 3 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 6d0d59f38815..5422c26656d7 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 @@ -2320,7 +2320,9 @@ static boolean useUnifiedWorker(DataflowPipelineOptions options) { return hasExperiment(options, "beam_fn_api") || hasExperiment(options, "use_runner_v2") || hasExperiment(options, "use_unified_worker") - || (hasExperiment(options, "enable_prime") + || ((hasExperiment(options, "enable_prime") + || firstNonNull(options.getDataflowServiceOptions(), new ArrayList<>()) + .contains("enable_prime")) && !hasExperiment(options, "disable_prime_runner_v2")); }