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

Support explicitly setting spark app id #126

Merged
merged 2 commits into from
Aug 23, 2023
Merged

Support explicitly setting spark app id #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99f1032
Support explicitly setting spark app id
chi-yelp Aug 23, 2023
9a85e3e
Bump version
chi-yelp Aug 23, 2023
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
21 changes: 16 additions & 5 deletions service_configuration_lib/spark_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
import logging
import math
import os
import random
import re
import string
import time
from typing import Any
from typing import Dict
Expand Down Expand Up @@ -38,7 +40,6 @@

NON_CONFIGURABLE_SPARK_OPTS = {
'spark.master',
'spark.app.id',
'spark.ui.port',
'spark.mesos.principal',
'spark.mesos.secret',
Expand Down Expand Up @@ -1029,6 +1030,7 @@ def get_spark_conf(
aws_region: Optional[str] = None,
service_account_name: Optional[str] = None,
force_spark_resource_configs: bool = True,
spark_app_id: str = '', # to be removed once verified all applications are not explicitly setting app id
) -> Dict[str, str]:
"""Build spark config dict to run with spark on paasta

Expand Down Expand Up @@ -1057,6 +1059,7 @@ def get_spark_conf(
If not provided, it uses cert files at {K8S_AUTH_FOLDER} to authenticate.
:param force_spark_resource_configs: skip the resource/instances recalculation.
This is strongly not recommended.
:param explcitly setting spark.app.id
:returns: spark opts in a dict.
"""
# Mesos deprecation
Expand Down Expand Up @@ -1095,11 +1098,19 @@ def get_spark_conf(
# in all places for metric systems:
# - since in the Promehteus metrics endpoint those will be converted to '_'
# - while the 'spark-app-selector' executor pod label will keep the original app id
if is_jupyter:
raw_app_id = app_name
if len(spark_app_id) == 0:
if is_jupyter:
raw_app_id = app_name
else:
random_postfix = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(4))
raw_app_id = f'{paasta_service}__{paasta_instance}__{random_postfix}'
app_id = re.sub(r'[\.,-]', '_', _get_k8s_resource_name_limit_size_with_hash(raw_app_id))
else:
raw_app_id = f'{paasta_service}__{paasta_instance}__{int(time.time()) % 10000}'
app_id = re.sub(r'[\.,-]', '_', _get_k8s_resource_name_limit_size_with_hash(raw_app_id))
log.warning(
'We do not recommend users to set spark.app.id, as it could diminish the clarity of identification '
'and can potentially cause the monitoring dashboard to not work properly.',
)
app_id = spark_app_id

spark_conf.update({
'spark.app.name': app_name,
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.18.5',
version='2.18.6',
provides=['service_configuration_lib'],
description='Start, stop, and inspect Yelp SOA services',
url='https://github.com/Yelp/service_configuration_lib',
Expand Down
Loading