ff8de99a1c
## What changes were proposed in this pull request?
Seems there was a mistake - missing import for `subprocess.call`, while refactoring this script a long ago, which should be used for backports of some missing functions in `subprocess`, specifically in < Python 2.7.
Reproduction is:
```
cd dev && python2.6
```
```
>>> from sparktestsupport import shellutils
>>> shellutils.subprocess_check_call("ls")
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "sparktestsupport/shellutils.py", line 46, in subprocess_check_call
retcode = call(*popenargs, **kwargs)
NameError: global name 'call' is not defined
```
For Jenkins logs, please see https://amplab.cs.berkeley.edu/jenkins/job/NewSparkPullRequestBuilder/3950/console
Since we dropped the Python 2.6.x support, looks better we remove those workarounds and print out explicit error messages in order to reduce the efforts to find out the root causes for such cases, for example, `https://github.com/apache/spark/pull/19513#issuecomment-337406734`.
## How was this patch tested?
Manually tested:
```
./dev/run-tests
```
```
Python versions prior to 2.7 are not supported.
```
```
./dev/run-tests-jenkins
```
```
Python versions prior to 2.7 are not supported.
```
Author: hyukjinkwon <gurwls223@gmail.com>
Closes #19524 from HyukjinKwon/SPARK-22302.
92 lines
2.7 KiB
Python
92 lines
2.7 KiB
Python
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
|
# contributor license agreements. See the NOTICE file distributed with
|
|
# this work for additional information regarding copyright ownership.
|
|
# The ASF licenses this file to You under the Apache License, Version 2.0
|
|
# (the "License"); you may not use this file except in compliance with
|
|
# the License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
from __future__ import print_function
|
|
import os
|
|
import shutil
|
|
import subprocess
|
|
import sys
|
|
|
|
subprocess_check_output = subprocess.check_output
|
|
subprocess_check_call = subprocess.check_call
|
|
|
|
|
|
def exit_from_command_with_retcode(cmd, 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)))
|
|
|
|
|
|
def rm_r(path):
|
|
"""
|
|
Given an arbitrary path, properly remove it with the correct Python construct if it exists.
|
|
From: http://stackoverflow.com/a/9559881
|
|
"""
|
|
|
|
if os.path.isdir(path):
|
|
shutil.rmtree(path)
|
|
elif os.path.exists(path):
|
|
os.remove(path)
|
|
|
|
|
|
def run_cmd(cmd, return_output=False):
|
|
"""
|
|
Given a command as a list of arguments will attempt to execute the command
|
|
and, on failure, print an error message and exit.
|
|
"""
|
|
|
|
if not isinstance(cmd, list):
|
|
cmd = cmd.split()
|
|
try:
|
|
if return_output:
|
|
return subprocess_check_output(cmd)
|
|
else:
|
|
return subprocess_check_call(cmd)
|
|
except subprocess.CalledProcessError as e:
|
|
exit_from_command_with_retcode(e.cmd, e.returncode)
|
|
|
|
|
|
def is_exe(path):
|
|
"""
|
|
Check if a given path is an executable file.
|
|
From: http://stackoverflow.com/a/377028
|
|
"""
|
|
|
|
return os.path.isfile(path) and os.access(path, os.X_OK)
|
|
|
|
|
|
def which(program):
|
|
"""
|
|
Find and return the given program by its absolute path or 'None' if the program cannot be found.
|
|
From: http://stackoverflow.com/a/377028
|
|
"""
|
|
|
|
fpath = os.path.split(program)[0]
|
|
|
|
if fpath:
|
|
if is_exe(program):
|
|
return program
|
|
else:
|
|
for path in os.environ.get("PATH").split(os.pathsep):
|
|
path = path.strip('"')
|
|
exe_file = os.path.join(path, program)
|
|
if is_exe(exe_file):
|
|
return exe_file
|
|
return None
|