Skip to content

[SPARK-16077] [PYSPARK] catch the exception from pickle.whichmodule() #13788

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
davies wants to merge 3 commits into from
Closed

[SPARK-16077] [PYSPARK] catch the exception from pickle.whichmodule() #13788

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d3df9a
catch the exception from pickle.whichmodule()
Jun 20, 2016
8cc69e0
Update cloudpickle.py
Jun 24, 2016
b823562
Update cloudpickle.py
Jun 24, 2016
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/cloudpickle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,12 @@ def save_function(self, obj, name=None):

if name is None:
name = obj.__name__
modname = pickle.whichmodule(obj, name)
try:
# whichmodule() could fail, see
# https://bitbucket.org/gutworth/six/issues/63/importing-six-breaks-pickling
modname = pickle.whichmodule(obj, name)
except Exception:
Copy link
Contributor

@JoshRosen JoshRosen Jun 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a narrower exception that we can catch (ImportError perhaps)?

Copy link
Contributor Author

@davies davies Jun 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will run into arbitary code, so anything could happen

modname = None
# print('which gives %s %s %s' % (modname, obj, name))
try:
themodule = sys.modules[modname]
Expand Down Expand Up @@ -326,7 +331,12 @@ def save_global(self, obj, name=None, pack=struct.pack):

modname = getattr(obj, "__module__", None)
if modname is None:
modname = pickle.whichmodule(obj, name)
try:
# whichmodule() could fail, see
# https://bitbucket.org/gutworth/six/issues/63/importing-six-breaks-pickling
modname = pickle.whichmodule(obj, name)
except Exception:
modname = '__main__'
Copy link
Contributor

@JoshRosen JoshRosen Jun 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The use of __main__ here seems consistent with the error-handling path on line 181 👍


if modname == '__main__':
themodule = None
Expand Down