This is an automated email from the ASF dual-hosted git repository.
danoliveira pushed a commit to branch release-2.24.0
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/release-2.24.0 by this push:
new e65a6a7 Merge pull request #12585: [BEAM-10698] Cherry-pick #12561
e65a6a7 is described below
commit e65a6a77803151576b97b3452df3652d50cd20dc
Author: Boyuan Zhang <36090911+boyua...@users.noreply.github.com>
AuthorDate: Tue Aug 18 20:00:51 2020 -0700
Merge pull request #12585: [BEAM-10698] Cherry-pick #12561
* Enable dataflow streaming engine when running runner_v2 and streaming.
(cherry picked from commit 5b0bacdfa24e66024d331b575cfcd7a9064f885f)
* Fix formatter.
(cherry picked from commit e1ec7f63e40f50e4101e2f5339738545bfea7f9b)
---
sdks/python/apache_beam/runners/dataflow/dataflow_runner.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/sdks/python/apache_beam/runners/dataflow/dataflow_runner.py
b/sdks/python/apache_beam/runners/dataflow/dataflow_runner.py
index dca3a39..e6cb924 100644
--- a/sdks/python/apache_beam/runners/dataflow/dataflow_runner.py
+++ b/sdks/python/apache_beam/runners/dataflow/dataflow_runner.py
@@ -529,14 +529,20 @@ class DataflowRunner(PipelineRunner):
if google_cloud_options.enable_streaming_engine:
debug_options.add_experiment("enable_windmill_service")
debug_options.add_experiment("enable_streaming_engine")
+ elif (apiclient._use_fnapi(options) and
+ apiclient._use_unified_worker(options) and
+ options.view_as(StandardOptions).streaming):
+ debug_options.add_experiment("enable_windmill_service")
+ debug_options.add_experiment("enable_streaming_engine")
else:
if (debug_options.lookup_experiment("enable_windmill_service") or
debug_options.lookup_experiment("enable_streaming_engine")):
raise ValueError(
"""Streaming engine both disabled and enabled:
- enable_streaming_engine flag is not set, but enable_windmill_service
+ --enable_streaming_engine flag is not set, but
+ enable_windmill_service
and/or enable_streaming_engine experiments are present.
- It is recommended you only set the enable_streaming_engine flag.""")
+ It is recommended you only set the --enable_streaming_engine flag.""")
dataflow_worker_jar = getattr(worker_options, 'dataflow_worker_jar', None)
if dataflow_worker_jar is not None:
