Skip to content

[DRAFT] Fix Spark Connect Behavior for Default Session #42455

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

Closed
grundprinzip wants to merge 1 commit into from
Closed

[DRAFT] Fix Spark Connect Behavior for Default Session #42455

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
14 changes: 12 additions & 2 deletions python/pyspark/sql/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
_from_numpy_type,
)
from pyspark.errors.exceptions.captured import install_exception_handler
from pyspark.sql.utils import is_timestamp_ntz_preferred, to_str, try_remote_session_classmethod
from pyspark.sql.utils import is_timestamp_ntz_preferred, to_str, try_remote_session_classmethod, is_remote
from pyspark.errors import PySparkValueError, PySparkTypeError, PySparkRuntimeError

if TYPE_CHECKING:
Expand Down Expand Up @@ -455,7 +455,17 @@ def getOrCreate(self) -> "SparkSession":
opts = dict(self._options)

with self._lock:
if "SPARK_REMOTE" in os.environ or "spark.remote" in opts:
configures_spark_connect = "SPARK_REMOTE" in os.environ or "spark.remote" in opts

# For the case, when users want to create a default session, we explicitly retrieve the
# currently active session.
if is_remote() and not configures_spark_connect:
from pyspark.sql.connect.session import SparkSession as RemoteSparkSession
this_spark = RemoteSparkSession.getActiveSession()
if this_spark is not None:
return this_spark

if configures_spark_connect:
with SparkContext._lock:
from pyspark.sql.connect.session import SparkSession as RemoteSparkSession

Expand Down