Repository: incubator-beam Updated Branches: refs/heads/master b44a7ac4a -> 3b2e0290d
[BEAM-1108] DataflowRunner: remove deprecated TEARDOWN_POLICY control Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/6439f701 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/6439f701 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/6439f701 Branch: refs/heads/master Commit: 6439f701d1008d6a0432828e11e0fcc8a4fe6ecc Parents: b44a7ac Author: Dan Halperin <[email protected]> Authored: Thu Dec 8 07:40:58 2016 +0800 Committer: Dan Halperin <[email protected]> Committed: Thu Dec 8 07:43:13 2016 +0800 ---------------------------------------------------------------------- .../dataflow/DataflowPipelineTranslator.java | 4 -- .../DataflowPipelineWorkerPoolOptions.java | 45 -------------------- 2 files changed, 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6439f701/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 8783056..8048df9 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 @@ -424,10 +424,6 @@ public class DataflowPipelineTranslator { WorkerPool workerPool = new WorkerPool(); - if (options.getTeardownPolicy() != null) { - workerPool.setTeardownPolicy(options.getTeardownPolicy().getTeardownPolicyName()); - } - if (options.isStreaming()) { job.setType("JOB_TYPE_STREAMING"); } else { http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6439f701/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineWorkerPoolOptions.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineWorkerPoolOptions.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineWorkerPoolOptions.java index ffb5a3a..157321a 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineWorkerPoolOptions.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineWorkerPoolOptions.java @@ -191,51 +191,6 @@ public interface DataflowPipelineWorkerPoolOptions extends PipelineOptions { void setWorkerMachineType(String value); /** - * The policy for tearing down the workers spun up by the service. - * - * @deprecated Dataflow Service will only support TEARDOWN_ALWAYS policy in the future. - */ - @Deprecated - enum TeardownPolicy { - /** - * All VMs created for a Dataflow job are deleted when the job finishes, regardless of whether - * it fails or succeeds. - */ - TEARDOWN_ALWAYS("TEARDOWN_ALWAYS"), - /** - * All VMs created for a Dataflow job are left running when the job finishes, regardless of - * whether it fails or succeeds. - */ - TEARDOWN_NEVER("TEARDOWN_NEVER"), - /** - * All VMs created for a Dataflow job are deleted when the job succeeds, but are left running - * when it fails. (This is typically used for debugging failing jobs by SSHing into the - * workers.) - */ - TEARDOWN_ON_SUCCESS("TEARDOWN_ON_SUCCESS"); - - private final String teardownPolicy; - - TeardownPolicy(String teardownPolicy) { - this.teardownPolicy = teardownPolicy; - } - - public String getTeardownPolicyName() { - return this.teardownPolicy; - } - } - - /** - * The teardown policy for the VMs. - * - * <p>If unset, the Dataflow service will choose a reasonable default. - */ - @Description("The teardown policy for the VMs. If unset, the Dataflow service will " - + "choose a reasonable default.") - TeardownPolicy getTeardownPolicy(); - void setTeardownPolicy(TeardownPolicy value); - - /** * List of local files to make available to workers. * * <p>Files are placed on the worker's classpath.
