Repository: beam Updated Branches: refs/heads/python-sdk a2fe856db -> 296fdcdb3
Remove obsolete teardown_policy argument Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/0c24fc26 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/0c24fc26 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/0c24fc26 Branch: refs/heads/python-sdk Commit: 0c24fc26c32b6dd4ba5023ec3596dd5f6924a126 Parents: a2fe856 Author: Ahmet Altay <[email protected]> Authored: Thu Jan 5 15:33:08 2017 -0800 Committer: Ahmet Altay <[email protected]> Committed: Thu Jan 5 15:33:08 2017 -0800 ---------------------------------------------------------------------- sdks/python/apache_beam/internal/apiclient.py | 11 ----------- sdks/python/apache_beam/utils/pipeline_options.py | 7 ------- 2 files changed, 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/0c24fc26/sdks/python/apache_beam/internal/apiclient.py ---------------------------------------------------------------------- diff --git a/sdks/python/apache_beam/internal/apiclient.py b/sdks/python/apache_beam/internal/apiclient.py index 001ae64..3567430 100644 --- a/sdks/python/apache_beam/internal/apiclient.py +++ b/sdks/python/apache_beam/internal/apiclient.py @@ -208,17 +208,6 @@ class Environment(object): pool.workerHarnessContainerImage = ( 'dataflow.gcr.io/v1beta3/python:%s' % get_required_container_version()) - if self.worker_options.teardown_policy: - if self.worker_options.teardown_policy == 'TEARDOWN_NEVER': - pool.teardownPolicy = ( - dataflow.WorkerPool.TeardownPolicyValueValuesEnum.TEARDOWN_NEVER) - elif self.worker_options.teardown_policy == 'TEARDOWN_ALWAYS': - pool.teardownPolicy = ( - dataflow.WorkerPool.TeardownPolicyValueValuesEnum.TEARDOWN_ALWAYS) - elif self.worker_options.teardown_policy == 'TEARDOWN_ON_SUCCESS': - pool.teardownPolicy = ( - dataflow.WorkerPool - .TeardownPolicyValueValuesEnum.TEARDOWN_ON_SUCCESS) if self.worker_options.use_public_ips is not None: if self.worker_options.use_public_ips: pool.ipConfiguration = ( http://git-wip-us.apache.org/repos/asf/beam/blob/0c24fc26/sdks/python/apache_beam/utils/pipeline_options.py ---------------------------------------------------------------------- diff --git a/sdks/python/apache_beam/utils/pipeline_options.py b/sdks/python/apache_beam/utils/pipeline_options.py index 3e09a3b..e86e379 100644 --- a/sdks/python/apache_beam/utils/pipeline_options.py +++ b/sdks/python/apache_beam/utils/pipeline_options.py @@ -354,13 +354,6 @@ class WorkerOptions(PipelineOptions): 'SDK. Note: currently, only approved Google Cloud Dataflow ' 'container images may be used here.')) parser.add_argument( - '--teardown_policy', - choices=['TEARDOWN_ALWAYS', 'TEARDOWN_NEVER', 'TEARDOWN_ON_SUCCESS'], - default=None, - help= - ('The teardown policy for the VMs. By default this is left unset and ' - 'the service sets the default policy.')) - parser.add_argument( '--use_public_ips', default=None, help='Whether to assign public IP addresses to the worker machines.')
