Skip to content

Bugfix for issue #6405: Fast registration runs into infinite loop #3230

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

Merged
Future-Outlier merged 4 commits into from
Apr 17, 2025
Merged

Bugfix for issue #6405: Fast registration runs into infinite loop #3230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d7148e
Bugfix for issue #6405: Fast registration runs into infinite loop
rambrus Apr 15, 2025
1172159
Replace tempfile.TemporaryDirectory().name with tempfile.mkdtemp()
rambrus Apr 15, 2025
854d54a
Update and add unit tests
rambrus Apr 15, 2025
cb153b4
Merge unit tests, fix lint issues
rambrus Apr 16, 2025
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
6 changes: 4 additions & 2 deletions plugins/flytekit-spark/flytekitplugins/spark/task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import dataclasses
import os
import shutil
import tempfile
from dataclasses import dataclass
from typing import Any, Callable, Dict, Optional, Union, cast

Expand Down Expand Up @@ -237,10 +238,11 @@ def pre_execute(self, user_params: ExecutionParameters) -> ExecutionParameters:
and ctx.execution_state
and ctx.execution_state.mode == ExecutionState.Mode.TASK_EXECUTION
):
base_dir = tempfile.mkdtemp()
file_name = "flyte_wf"
file_format = "zip"
shutil.make_archive(file_name, file_format, os.getcwd())
self.sess.sparkContext.addPyFile(f"{file_name}.{file_format}")
shutil.make_archive(f"{base_dir}/{file_name}", file_format, os.getcwd())
self.sess.sparkContext.addPyFile(f"{base_dir}/{file_name}.{file_format}")

return user_params.builder().add_attr("SPARK_SESSION", self.sess).build()

Expand Down
10 changes: 7 additions & 3 deletions plugins/flytekit-spark/tests/test_spark_task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import pandas as pd
import pyspark
import pytest
import tempfile

from google.protobuf.json_format import MessageToDict
from flytekit import PodTemplate
Expand Down Expand Up @@ -157,8 +158,10 @@ def test_to_html():
assert pd.DataFrame(df.schema, columns=["StructField"]).to_html() == output


@mock.patch("tempfile.mkdtemp", return_value="/tmp/123")
@mock.patch("shutil.make_archive")
@mock.patch("pyspark.context.SparkContext.addPyFile")
def test_spark_addPyFile(mock_add_pyfile):
def test_spark_addPyFile(mock_add_pyfile, mock_shutil_make_archive, mock_tempfile_mkdtemp):
@task(
task_config=Spark(
spark_conf={"spark": "1"},
Expand Down Expand Up @@ -190,9 +193,10 @@ def my_spark(a: int) -> int:
).with_serialization_settings(serialization_settings)
) as new_ctx:
my_spark.pre_execute(new_ctx.user_space_params)
mock_add_pyfile.assert_called_once()
os.remove(os.path.join(os.getcwd(), "flyte_wf.zip"))

mock_tempfile_mkdtemp.assert_called_once()
mock_shutil_make_archive.assert_called_once_with("/tmp/123/flyte_wf", "zip", os.getcwd())
mock_add_pyfile.assert_called_once_with("/tmp/123/flyte_wf.zip")

def test_spark_with_image_spec():
custom_image = ImageSpec(
Expand Down
Loading