[beam] branch master updated: Got rid of reference to windmill_service_streaming_rpc_batching experiment (#7728)

[altay]

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

altay 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 f31ae86  Got rid of reference to 
windmill_service_streaming_rpc_batching experiment (#7728)
f31ae86 is described below

commit f31ae860892d8b4e1bd26df946acfe7185140d36
Author: drieber <drie...@google.com>
AuthorDate: Tue Feb 5 15:28:49 2019 -0800

    Got rid of reference to windmill_service_streaming_rpc_batching experiment 
(#7728)
    
    * There is no need to predicate 
WindmillServiceStreamingRpcBatchLimitFactory on the 
windmill_service_streaming_rpc_batching experiment. That experiment is now 
fully rolled out.
    
    * Fixed argument to streamingEngineEnabled.
---
 .../dataflow/worker/options/StreamingDataflowWorkerOptions.java     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git 
a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/options/StreamingDataflowWorkerOptions.java
 
b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/options/StreamingDataflowWorkerOptions.java
index a136d7e..35c9b57 100644
--- 
a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/options/StreamingDataflowWorkerOptions.java
+++ 
b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/options/StreamingDataflowWorkerOptions.java
@@ -200,11 +200,7 @@ public interface StreamingDataflowWorkerOptions extends 
DataflowWorkerHarnessOpt
     public Integer create(PipelineOptions options) {
       StreamingDataflowWorkerOptions streamingOptions =
           options.as(StreamingDataflowWorkerOptions.class);
-      if (streamingEngineEnabled(streamingOptions)
-          && hasExperiment(streamingOptions, 
"windmill_service_streaming_rpc_batching")) {
-        return Integer.MAX_VALUE;
-      }
-      return 1;
+      return streamingEngineEnabled(streamingOptions) ? Integer.MAX_VALUE : 1;
     }
   }
 }