You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ks...@apache.org on 2021/07/22 11:44:54 UTC

[arrow] branch master updated: ARROW-13432: [Release] Fix ssh connection to the binary uploader container

This is an automated email from the ASF dual-hosted git repository.

kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new dcf3a0b  ARROW-13432: [Release] Fix ssh connection to the binary uploader container
dcf3a0b is described below

commit dcf3a0bd9d0950e426f000a434e73bf036d1d51a
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Thu Jul 22 13:42:22 2021 +0200

    ARROW-13432: [Release] Fix ssh connection to the binary uploader container
    
    Out of the sudden the binary upload script has stopped working for me, it was just hanging infinitely.
    After a lot of digging found that the `ssh_port` variable contained two identical ports, thus the port number [was passed to the ssh command as an additional argument](https://github.com/apache/arrow/blob/master/dev/release/utils-binary.sh#L45).
    
    Closes #10770 from kszucs/binary-upload-hangs
    
    Authored-by: Krisztián Szűcs <sz...@gmail.com>
    Signed-off-by: Krisztián Szűcs <sz...@gmail.com>
---
 dev/release/05-binary-upload.sh | 1 +
 dev/release/utils-binary.sh     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/release/05-binary-upload.sh b/dev/release/05-binary-upload.sh
index 6f318fc..c841fa7 100755
--- a/dev/release/05-binary-upload.sh
+++ b/dev/release/05-binary-upload.sh
@@ -129,6 +129,7 @@ docker_run \
   rake \
     "${rake_tasks[@]}" \
     APT_TARGETS=$(IFS=,; echo "${apt_targets[*]}") \
+    ARTIFACTORY_API_KEY="${ARTIFACTORY_API_KEY}" \
     ARTIFACTS_DIR="${tmp_dir}/artifacts" \
     RC=${rc} \
     VERSION=${version} \
diff --git a/dev/release/utils-binary.sh b/dev/release/utils-binary.sh
index 7c66e37..31ebcd8 100644
--- a/dev/release/utils-binary.sh
+++ b/dev/release/utils-binary.sh
@@ -70,7 +70,7 @@ fi
 /usr/sbin/sshd -D
 "
   local container_id=$(cat ${container_id_file})
-  local ssh_port=$(docker port ${container_id} | grep -E -o '[0-9]+$')
+  local ssh_port=$(docker port ${container_id} | grep -E -o '[0-9]+$' | head -n 1)
   # Wait for sshd available
   while ! docker_gpg_ssh ${ssh_port} : > /dev/null 2>&1; do
     sleep 0.1