[beam] branch master updated: [BEAM-12114] Dataflow should apply KAFKA_READ_OVERRIDE when it's not with runner_v2

[boyuanz]

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

boyuanz 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 1fdfef5  [BEAM-12114] Dataflow should apply KAFKA_READ_OVERRIDE when 
it's not with runner_v2
     new 4439170  Merge pull request #14608 from [BEAM-12114] Dataflow should 
apply KAFKA_READ_OVERRIDE when it's not with runner_v2
1fdfef5 is described below

commit 1fdfef5298b64aa8b253e02e2df286cd78bcfe38
Author: Boyuan Zhang <boyu...@google.com>
AuthorDate: Wed Apr 21 11:40:58 2021 -0700

    [BEAM-12114] Dataflow should apply KAFKA_READ_OVERRIDE when it's not with 
runner_v2
---
 .../src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java  | 2 +-
 1 file changed, 1 insertion(+), 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 0a79cd9..42d463e 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
@@ -492,7 +492,7 @@ public class DataflowRunner extends 
PipelineRunner<DataflowPipelineJob> {
                   new StreamingPubsubIOWriteOverrideFactory(this)));
         }
       }
-      if (useUnifiedWorker(options)) {
+      if (!fnApiEnabled) {
         overridesBuilder.add(KafkaIO.Read.KAFKA_READ_OVERRIDE);
       }
       overridesBuilder.add(