Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove showConsoleProgress flag #92

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Remove showConsoleProgress flag #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f59aaf2
Remove showConsoleProgress flag
88manpreet Nov 2, 2022
1aada19
Fix tests
88manpreet Nov 17, 2022
e37d373
Bump version to disable spark console status logging
88manpreet Nov 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions service_configuration_lib/spark_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,9 +888,6 @@ def get_spark_conf(
# configure spark conf log
spark_conf = _append_spark_config(spark_conf, 'spark.logConf', 'true')

# configure spark Console Progress
spark_conf = _append_spark_config(spark_conf, 'spark.ui.showConsoleProgress', 'true')

spark_conf = _append_aws_credentials_conf(spark_conf, *aws_creds, aws_region)
return spark_conf

Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

setup(
name='service-configuration-lib',
version='2.12.3',
version='2.12.4',
provides=['service_configuration_lib'],
description='Start, stop, and inspect Yelp SOA services',
url='https://github.com/Yelp/service_configuration_lib',
Expand Down
30 changes: 1 addition & 29 deletions tests/spark_config_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,22 +667,6 @@ def test_append_spark_conf_log(

assert output[key] == expected_output

@pytest.mark.parametrize(
'user_spark_opts,expected_output', [
# not configured by user
({}, 'true'),
# configured by user
({'spark.ui.showConsoleProgress': 'false'}, 'false'),
],
)
def test_append_console_progress_conf(
self, user_spark_opts, expected_output,
):
key = 'spark.ui.showConsoleProgress'
output = spark_config._append_spark_config(user_spark_opts, key, 'true')

assert output[key] == expected_output

def test_append_aws_credentials_conf(self):
output = spark_config._append_aws_credentials_conf(
{},
Expand All @@ -702,14 +686,6 @@ def mock_append_spark_conf_log(self):
) as m:
yield m

@pytest.fixture
def mock_append_console_progress_conf(self):
return_value = {'spark.ui.showConsoleProgress': 'true'}
with MockConfigFunction(
'_append_spark_config', return_value,
) as m:
yield m

@pytest.fixture
def mock_get_mesos_docker_volumes_conf(self):
return_value = {'spark.mesos.executor.docker.volumes': '/tmp:/tmp:ro'}
Expand Down Expand Up @@ -960,7 +936,6 @@ def test_get_spark_conf_mesos(
assert_app_name,
mock_log,
mock_append_spark_conf_log,
mock_append_console_progress_conf,
):
other_spark_opts = {'spark.driver.memory': '2g', 'spark.executor.memoryOverhead': '1024'}
not_allowed_opts = {'spark.executorEnv.PAASTA_SERVICE': 'random-service'}
Expand Down Expand Up @@ -1007,8 +982,7 @@ def test_get_spark_conf_mesos(
list(mock_append_event_log_conf.return_value.keys()) +
list(mock_append_aws_credentials_conf.return_value.keys()) +
list(mock_append_sql_shuffle_partitions_conf.return_value.keys()) +
list(mock_append_spark_conf_log.return_value.keys()) +
list(mock_append_console_progress_conf.return_value.keys()),
list(mock_append_spark_conf_log.return_value.keys()),
)
assert len(set(output.keys()) - verified_keys) == 0
mock_get_mesos_docker_volumes_conf.mocker.assert_called_once_with(
Expand Down Expand Up @@ -1063,7 +1037,6 @@ def assert_kubernetes_conf(self, base_volumes):
'spark.kubernetes.executor.label.paasta.yelp.com/pool': self.pool,
'spark.kubernetes.executor.label.yelp.com/owner': 'core_ml',
'spark.logConf': 'true',
'spark.ui.showConsoleProgress': 'true',
}
for i, volume in enumerate(base_volumes + self._get_k8s_base_volumes()):
expected_output[f'spark.kubernetes.executor.volumes.hostPath.{i}.mount.path'] = volume['containerPath']
Expand Down Expand Up @@ -1150,7 +1123,6 @@ def assert_local_conf(self, base_volumes):
'spark.executorEnv.PAASTA_INSTANCE_TYPE': 'spark',
'spark.executorEnv.SPARK_EXECUTOR_DIRS': '/tmp',
'spark.logConf': 'true',
'spark.ui.showConsoleProgress': 'true',
}
for i, volume in enumerate(base_volumes + self._get_k8s_base_volumes()):
expected_output[f'spark.kubernetes.executor.volumes.hostPath.{i}.mount.path'] = volume['containerPath']
Expand Down