You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by al...@apache.org on 2019/06/11 17:56:04 UTC
[beam] branch master updated: Remove the unnecessary
enable_health_checker flag
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 a8bdcc5 Remove the unnecessary enable_health_checker flag
new 47ba869 Merge pull request #8783 from robinyqiu/resilience
a8bdcc5 is described below
commit a8bdcc599aa1686717f76a048e82151d0c2b4fe2
Author: Yueyang Qiu <ro...@gmail.com>
AuthorDate: Thu Jun 6 16:54:56 2019 -0700
Remove the unnecessary enable_health_checker flag
---
.../runners/dataflow/internal/apiclient.py | 7 ------
.../runners/dataflow/internal/apiclient_test.py | 28 ----------------------
2 files changed, 35 deletions(-)
diff --git a/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py b/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py
index 8b7f9e3..1eec4d1 100644
--- a/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py
+++ b/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py
@@ -191,13 +191,6 @@ class Environment(object):
if ('use_multiple_sdk_containers' not in debug_options_experiments and
'no_use_multiple_sdk_containers' not in debug_options_experiments):
debug_options_experiments.append('use_multiple_sdk_containers')
- # Add enable_health_checker flag if it's not already present. Do not
- # add the flag if 'disable_health_checker' is present.
- # TODO[BEAM-7466]: Cleanup enable_health_checker once Python SDK 2.13
- # becomes unsupported.
- if ('enable_health_checker' not in debug_options_experiments and
- 'disable_health_checker' not in debug_options_experiments):
- debug_options_experiments.append('enable_health_checker')
# FlexRS
if self.google_cloud_options.flexrs_goal == 'COST_OPTIMIZED':
self.proto.flexResourceSchedulingGoal = (
diff --git a/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py b/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py
index b67d0ce..0c75b4b 100644
--- a/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py
+++ b/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py
@@ -500,34 +500,6 @@ class UtilTest(unittest.TestCase):
self.assertNotIn(
'use_multiple_sdk_containers', environment.proto.experiments)
- def test_experiment_enable_health_checker(self):
- pipeline_options = PipelineOptions(
- ['--project', 'test_project', '--job_name', 'test_job_name',
- '--temp_location', 'gs://test-location/temp',
- '--experiments', 'beam_fn_api'])
- environment = apiclient.Environment(
- [], pipeline_options, 1, FAKE_PIPELINE_URL)
- self.assertIn('enable_health_checker', environment.proto.experiments)
-
- pipeline_options = PipelineOptions(
- ['--project', 'test_project', '--job_name', 'test_job_name',
- '--temp_location', 'gs://test-location/temp',
- '--experiments', 'beam_fn_api',
- '--experiments', 'enable_health_checker'])
- environment = apiclient.Environment(
- [], pipeline_options, 1, FAKE_PIPELINE_URL)
- self.assertIn('enable_health_checker', environment.proto.experiments)
-
- pipeline_options = PipelineOptions(
- ['--project', 'test_project', '--job_name', 'test_job_name',
- '--temp_location', 'gs://test-location/temp',
- '--experiments', 'beam_fn_api',
- '--experiments', 'disable_health_checker'])
- environment = apiclient.Environment(
- [], pipeline_options, 1, FAKE_PIPELINE_URL)
- self.assertNotIn('enable_health_checker', environment.proto.experiments)
- self.assertIn('disable_health_checker', environment.proto.experiments)
-
@mock.patch(
'apache_beam.runners.dataflow.internal.apiclient.sys.version_info',
(3, 5))