ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[SPARK-15975] Fix improper Popen retcode code handling in dev/run-tests

Browse source 
In the `dev/run-tests.py` script we check a `Popen.retcode` for success using `retcode > 0`, but this is subtlety wrong because Popen's return code will be negative if the child process was terminated by a signal: https://docs.python.org/2/library/subprocess.html#subprocess.Popen.returncode

In order to properly handle signals, we should change this to check `retcode != 0` instead.

Author: Josh Rosen <joshrosen@databricks.com>

Closes #13692 from JoshRosen/dev-run-tests-return-code-handling.
This commit is contained in:
Josh Rosen 2016-06-16 14:18:58 -07:00 committed by Andrew Or
parent bbad4cb48d
commit acef843f67
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dev/run-tests.py
View file

@ -294,7 +294,7 @@ def exec_sbt(sbt_args=()):
print(line, end='')
retcode = sbt_proc.wait()
if retcode > 0:
if retcode != 0:
exit_from_command_with_retcode(sbt_cmd, retcode)

5
dev/sparktestsupport/shellutils.py
View file

@ -53,7 +53,10 @@ else:
def exit_from_command_with_retcode(cmd, retcode):
print("[error] running", ' '.join(cmd), "; received return code", retcode)
if retcode < 0:
print("[error] running", ' '.join(cmd), "; process was terminated by signal", -retcode)
else:
print("[error] running", ' '.join(cmd), "; received return code", retcode)
sys.exit(int(os.environ.get("CURRENT_BLOCK", 255)))