Skip to content
Snippets Groups Projects
Commit 4056191d authored by Josh Rosen's avatar Josh Rosen
Browse files

[SPARK-20102] Fix nightly packaging and RC packaging scripts w/ two minor build fixes


## What changes were proposed in this pull request?

The master snapshot publisher builds are currently broken due to two minor build issues:

1. For unknown reasons, the LFTP `mkdir -p` command began throwing errors when the remote directory already exists. This change of behavior might have been caused by configuration changes in the ASF's SFTP server, but I'm not entirely sure of that. To work around this problem, this patch updates the script to ignore errors from the `lftp mkdir -p` commands.
2. The PySpark `setup.py` file references a non-existent `pyspark.ml.stat` module, causing Python packaging to fail by complaining about a missing directory. The fix is to simply drop that line from the setup script.

## How was this patch tested?

The LFTP fix was tested by manually running the failing commands on AMPLab Jenkins against the ASF SFTP server. The PySpark fix was tested locally.

Author: Josh Rosen <joshrosen@databricks.com>

Closes #17437 from JoshRosen/spark-20102.

(cherry picked from commit 314cf51d)
Signed-off-by: default avatarJosh Rosen <joshrosen@databricks.com>
parent b6d348ee
No related branches found
No related tags found
No related merge requests found
......@@ -249,7 +249,7 @@ if [[ "$1" == "package" ]]; then
dest_dir="$REMOTE_PARENT_DIR/${DEST_DIR_NAME}-bin"
echo "Copying release tarballs to $dest_dir"
# Put to new directory:
LFTP mkdir -p $dest_dir
LFTP mkdir -p $dest_dir || true
LFTP mput -O $dest_dir 'spark-*'
LFTP mput -O $dest_dir 'pyspark-*'
LFTP mput -O $dest_dir 'SparkR_*'
......@@ -257,7 +257,7 @@ if [[ "$1" == "package" ]]; then
LFTP "rm -r -f $REMOTE_PARENT_DIR/latest || exit 0"
LFTP mv $dest_dir "$REMOTE_PARENT_DIR/latest"
# Re-upload a second time and leave the files in the timestamped upload directory:
LFTP mkdir -p $dest_dir
LFTP mkdir -p $dest_dir || true
LFTP mput -O $dest_dir 'spark-*'
LFTP mput -O $dest_dir 'pyspark-*'
LFTP mput -O $dest_dir 'SparkR_*'
......@@ -275,13 +275,13 @@ if [[ "$1" == "docs" ]]; then
PRODUCTION=1 RELEASE_VERSION="$SPARK_VERSION" jekyll build
echo "Copying release documentation to $dest_dir"
# Put to new directory:
LFTP mkdir -p $dest_dir
LFTP mkdir -p $dest_dir || true
LFTP mirror -R _site $dest_dir
# Delete /latest directory and rename new upload to /latest
LFTP "rm -r -f $REMOTE_PARENT_DIR/latest || exit 0"
LFTP mv $dest_dir "$REMOTE_PARENT_DIR/latest"
# Re-upload a second time and leave the files in the timestamped upload directory:
LFTP mkdir -p $dest_dir
LFTP mkdir -p $dest_dir || true
LFTP mirror -R _site $dest_dir
cd ..
exit 0
......
......@@ -167,7 +167,6 @@ try:
'pyspark.ml',
'pyspark.ml.linalg',
'pyspark.ml.param',
'pyspark.ml.stat',
'pyspark.sql',
'pyspark.streaming',
'pyspark.bin',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment