Skip to content

[SPARK-2242] HOTFIX: pyspark shell hangs on simple job #1178

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

[SPARK-2242] HOTFIX: pyspark shell hangs on simple job #1178

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
21c9d7c
Do not mask stderr from output
andrewor14 Jun 23, 2014
0d1861f
Provide more helpful output if stdout is garbled
andrewor14 Jun 23, 2014
6dfbd1e
Don't swallow original exception
andrewor14 Jun 23, 2014
a09805b
Return more than 1 line of error message to user
andrewor14 Jun 23, 2014
20849a8
Tone down stdout interference message
andrewor14 Jun 24, 2014
e68e870
Merge branch 'master' of github.com:apache/spark into fix-python
andrewor14 Jun 24, 2014
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: 13 additions & 8 deletions python/pyspark/java_gateway.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,23 @@ def launch_gateway():
# Don't send ctrl-c / SIGINT to the Java gateway:
def preexec_func():
signal.signal(signal.SIGINT, signal.SIG_IGN)
proc = Popen(command, stdout=PIPE, stdin=PIPE, stderr=PIPE, preexec_fn=preexec_func)
proc = Popen(command, stdout=PIPE, stdin=PIPE, preexec_fn=preexec_func)
else:
# preexec_fn not supported on Windows
proc = Popen(command, stdout=PIPE, stdin=PIPE, stderr=PIPE)
proc = Popen(command, stdout=PIPE, stdin=PIPE)

try:
# Determine which ephemeral port the server started on:
gateway_port = int(proc.stdout.readline())
except:
error_code = proc.poll()
raise Exception("Launching GatewayServer failed with exit code %d: %s" %
(error_code, "".join(proc.stderr.readlines())))
gateway_port = proc.stdout.readline()
gateway_port = int(gateway_port)
except ValueError:
(stdout, _) = proc.communicate()
exit_code = proc.poll()
error_msg = "Launching GatewayServer failed"
error_msg += " with exit code %d!" % exit_code if exit_code else "! "
error_msg += "(Warning: unexpected output detected.)\n\n"
error_msg += gateway_port + stdout
raise Exception(error_msg)

# Create a thread to echo output from the GatewayServer, which is required
# for Java log output to show up:
Expand Down