You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/08/11 16:26:06 UTC
[2/2] incubator-beam git commit: Do not add DataDisks to windmill
service jobs.
Do not add DataDisks to windmill service jobs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/169f7a21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/169f7a21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/169f7a21
Branch: refs/heads/master
Commit: 169f7a21336001f423ea2a741b15361bb01de3dc
Parents: 84a0dd1
Author: David Rieber <dr...@google.com>
Authored: Tue Aug 9 14:05:25 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Thu Aug 11 09:25:54 2016 -0700
----------------------------------------------------------------------
.../apache/beam/runners/dataflow/DataflowPipelineTranslator.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/169f7a21/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java
index ac06b52..0ca92c8 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java
@@ -428,7 +428,9 @@ public class DataflowPipelineTranslator {
workerPool.setPackages(packages);
workerPool.setNumWorkers(options.getNumWorkers());
- if (options.isStreaming()) {
+ if (options.isStreaming()
+ && (options.getExperiments() == null
+ || !options.getExperiments().contains("enable_windmill_service"))) {
// Use separate data disk for streaming.
Disk disk = new Disk();
disk.setDiskType(options.getWorkerDiskType());