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

[ib...@apache.org]

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

ibzib pushed a commit to branch release-2.34.0
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/release-2.34.0 by this push:
     new 34938cf  [BEAM-13053] Avoid runner v2 when streaming engine explicitly disabled.
     new a4d5907  Merge pull request #15735 from ibzib/runnerv2
34938cf is described below

commit 34938cf5f68a2ab582f5e6c52031f9b9a972a7b6
Author: Robert Bradshaw <ro...@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')