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

Add driver ui port executor pod label for prometheus metrics #123

Merged
merged 1 commit into from
Aug 15, 2023
Merged

Add driver ui port executor pod label for prometheus metrics #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions service_configuration_lib/spark_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ def _get_k8s_spark_env(
docker_img: str,
volumes: Optional[List[Mapping[str, str]]],
paasta_pool: str,
driver_ui_port: int,
service_account_name: Optional[str] = None,
include_self_managed_configs: bool = True,
k8s_server_address: Optional[str] = None,
Expand Down Expand Up @@ -294,6 +295,7 @@ def _get_k8s_spark_env(
'spark.kubernetes.executor.label.paasta.yelp.com/instance': _paasta_instance,
'spark.kubernetes.executor.label.paasta.yelp.com/cluster': _paasta_cluster,
'spark.kubernetes.executor.label.spark.yelp.com/user': user,
'spark.kubernetes.executor.label.spark.yelp.com/driver_ui_port': str(driver_ui_port),
'spark.kubernetes.node.selector.yelp.com/pool': paasta_pool,
'spark.kubernetes.executor.label.yelp.com/pool': paasta_pool,
'spark.kubernetes.executor.label.paasta.yelp.com/pool': paasta_pool,
Expand Down Expand Up @@ -1062,8 +1064,9 @@ def get_spark_conf(
spark_app_base_name
)

ui_port = (spark_opts_from_env or {}).get('spark.ui.port') or _pick_random_port(
PREFERRED_SPARK_UI_PORT,
ui_port = int(
(spark_opts_from_env or {}).get('spark.ui.port') or
_pick_random_port(PREFERRED_SPARK_UI_PORT),
)

# app_name from env is already appended port and time to make it unique
Expand Down Expand Up @@ -1096,6 +1099,7 @@ def get_spark_conf(
docker_img,
extra_volumes,
paasta_pool,
ui_port,
service_account_name=service_account_name,
include_self_managed_configs=not use_eks,
k8s_server_address=k8s_server_address,
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.2',
version='2.18.3',
provides=['service_configuration_lib'],
description='Start, stop, and inspect Yelp SOA services',
url='https://github.com/Yelp/service_configuration_lib',
Expand Down
5 changes: 4 additions & 1 deletion tests/spark_config_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,9 @@ def _get_k8s_base_volumes(self):
]

@pytest.fixture
def assert_kubernetes_conf(self, base_volumes):
def assert_kubernetes_conf(self, base_volumes, ui_port, mock_pick_random_port):
expected_ui_port = ui_port if ui_port else mock_pick_random_port

expected_output = {
'spark.master': f'k8s://https://k8s.{self.cluster}.paasta:6443',
'spark.executorEnv.PAASTA_SERVICE': self.service,
Expand All @@ -1191,6 +1193,7 @@ def assert_kubernetes_conf(self, base_volumes):
'spark.kubernetes.executor.label.paasta.yelp.com/instance': self.instance,
'spark.kubernetes.executor.label.paasta.yelp.com/cluster': self.cluster,
'spark.kubernetes.executor.label.spark.yelp.com/user': TEST_USER,
'spark.kubernetes.executor.label.spark.yelp.com/driver_ui_port': str(expected_ui_port),
'spark.kubernetes.node.selector.yelp.com/pool': self.pool,
'spark.kubernetes.executor.label.yelp.com/pool': self.pool,
'spark.kubernetes.executor.label.paasta.yelp.com/pool': self.pool,
Expand Down
Loading