Skip to content

Commit 314cf51

Browse files
committed
[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 <[email protected]> Closes #17437 from JoshRosen/spark-20102.
1 parent 0588dc7 commit 314cf51

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

dev/create-release/release-build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,15 +246,15 @@ if [[ "$1" == "package" ]]; then
246246
dest_dir="$REMOTE_PARENT_DIR/${DEST_DIR_NAME}-bin"
247247
echo "Copying release tarballs to $dest_dir"
248248
# Put to new directory:
249-
LFTP mkdir -p $dest_dir
249+
LFTP mkdir -p $dest_dir || true
250250
LFTP mput -O $dest_dir 'spark-*'
251251
LFTP mput -O $dest_dir 'pyspark-*'
252252
LFTP mput -O $dest_dir 'SparkR_*'
253253
# Delete /latest directory and rename new upload to /latest
254254
LFTP "rm -r -f $REMOTE_PARENT_DIR/latest || exit 0"
255255
LFTP mv $dest_dir "$REMOTE_PARENT_DIR/latest"
256256
# Re-upload a second time and leave the files in the timestamped upload directory:
257-
LFTP mkdir -p $dest_dir
257+
LFTP mkdir -p $dest_dir || true
258258
LFTP mput -O $dest_dir 'spark-*'
259259
LFTP mput -O $dest_dir 'pyspark-*'
260260
LFTP mput -O $dest_dir 'SparkR_*'
@@ -271,13 +271,13 @@ if [[ "$1" == "docs" ]]; then
271271
PRODUCTION=1 RELEASE_VERSION="$SPARK_VERSION" jekyll build
272272
echo "Copying release documentation to $dest_dir"
273273
# Put to new directory:
274-
LFTP mkdir -p $dest_dir
274+
LFTP mkdir -p $dest_dir || true
275275
LFTP mirror -R _site $dest_dir
276276
# Delete /latest directory and rename new upload to /latest
277277
LFTP "rm -r -f $REMOTE_PARENT_DIR/latest || exit 0"
278278
LFTP mv $dest_dir "$REMOTE_PARENT_DIR/latest"
279279
# Re-upload a second time and leave the files in the timestamped upload directory:
280-
LFTP mkdir -p $dest_dir
280+
LFTP mkdir -p $dest_dir || true
281281
LFTP mirror -R _site $dest_dir
282282
cd ..
283283
exit 0

python/setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ def _supports_symlinks():
167167
'pyspark.ml',
168168
'pyspark.ml.linalg',
169169
'pyspark.ml.param',
170-
'pyspark.ml.stat',
171170
'pyspark.sql',
172171
'pyspark.streaming',
173172
'pyspark.bin',

0 commit comments

Comments
 (0)