Repository: incubator-beam
Updated Branches:
  refs/heads/master a32a26208 -> 2ca54742b


[BEAM-186] Fix pubsub injector for streaming examples


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/1ff8948c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/1ff8948c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/1ff8948c

Branch: refs/heads/master
Commit: 1ff8948cbee07a6f9248685cc79369679e8b6a8b
Parents: a32a262
Author: Henning Rohde <[email protected]>
Authored: Fri Apr 8 17:06:18 2016 -0700
Committer: bchambers <[email protected]>
Committed: Fri Apr 8 18:12:12 2016 -0700

----------------------------------------------------------------------
 .../cloud/dataflow/examples/common/DataflowExampleUtils.java       | 2 ++
 .../src/main/java/common/DataflowExampleUtils.java                 | 2 ++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1ff8948c/examples/java/src/main/java/com/google/cloud/dataflow/examples/common/DataflowExampleUtils.java
----------------------------------------------------------------------
diff --git 
a/examples/java/src/main/java/com/google/cloud/dataflow/examples/common/DataflowExampleUtils.java
 
b/examples/java/src/main/java/com/google/cloud/dataflow/examples/common/DataflowExampleUtils.java
index 1b2a57c..5b98170 100644
--- 
a/examples/java/src/main/java/com/google/cloud/dataflow/examples/common/DataflowExampleUtils.java
+++ 
b/examples/java/src/main/java/com/google/cloud/dataflow/examples/common/DataflowExampleUtils.java
@@ -359,6 +359,8 @@ public class DataflowExampleUtils {
       
copiedOptions.setServiceAccountKeyfile(options.getServiceAccountKeyfile());
     }
     copiedOptions.setStreaming(false);
+    copiedOptions.setWorkerHarnessContainerImage(
+        DataflowPipelineRunner.BATCH_WORKER_HARNESS_CONTAINER_IMAGE);
     
copiedOptions.setNumWorkers(options.as(DataflowExampleOptions.class).getInjectorNumWorkers());
     copiedOptions.setJobName(options.getJobName() + "-injector");
     Pipeline injectorPipeline = Pipeline.create(copiedOptions);

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1ff8948c/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/DataflowExampleUtils.java
----------------------------------------------------------------------
diff --git 
a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/DataflowExampleUtils.java
 
b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/DataflowExampleUtils.java
index 443a396..5042c2e 100644
--- 
a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/DataflowExampleUtils.java
+++ 
b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/DataflowExampleUtils.java
@@ -275,6 +275,8 @@ public class DataflowExampleUtils {
   public void runInjectorPipeline(String inputFile, String topic) {
     DataflowPipelineOptions copiedOptions = 
options.cloneAs(DataflowPipelineOptions.class);
     copiedOptions.setStreaming(false);
+    copiedOptions.setWorkerHarnessContainerImage(
+        DataflowPipelineRunner.BATCH_WORKER_HARNESS_CONTAINER_IMAGE);
     copiedOptions.setNumWorkers(
         options.as(ExamplePubsubTopicOptions.class).getInjectorNumWorkers());
     copiedOptions.setJobName(options.getJobName() + "-injector");

Reply via email to