[beam] branch master updated: [BEAM-13053] Avoid runner v2 when streaming engine explicitly disabled.

[ibzib]

This is an automated email from the ASF dual-hosted git repository.

ibzib 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 7634dfb  [BEAM-13053] Avoid runner v2 when streaming engine explicitly 
disabled.
     new b0954e2  Merge pull request #15723 from robertwb/beam-13053
7634dfb is described below

commit 7634dfb815ae6e21490938eba250a8ab453956da
Author: Robert Bradshaw <rober...@gmail.com>
AuthorDate: Thu Oct 14 10:49:58 2021 -0700

    [BEAM-13053] Avoid runner v2 when streaming engine explicitly disabled.
---
 sdks/python/apache_beam/runners/dataflow/dataflow_runner.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdks/python/apache_beam/runners/dataflow/dataflow_runner.py 
b/sdks/python/apache_beam/runners/dataflow/dataflow_runner.py
index e78b973..36cd2c2 100644
--- a/sdks/python/apache_beam/runners/dataflow/dataflow_runner.py
+++ b/sdks/python/apache_beam/runners/dataflow/dataflow_runner.py
@@ -597,6 +597,7 @@ class DataflowRunner(PipelineRunner):
     debug_options = options.view_as(DebugOptions)
     # Streaming is always portable, default to runner v2.
     if (options.view_as(StandardOptions).streaming and
+        not debug_options.lookup_experiment('disable_streaming_engine') and
         not options.view_as(GoogleCloudOptions).dataflow_kms_key):
       if not debug_options.lookup_experiment('disable_runner_v2'):
         debug_options.add_experiment('beam_fn_api')