From b86e2c945958e8ff8846a6988019d4cc5b64ec3f Mon Sep 17 00:00:00 2001 From: David Seapy Date: Fri, 2 Mar 2018 12:28:25 -0500 Subject: [PATCH 1/2] Fix missing kafka tgz from mirror by pointing to archive.apache.org --- bin/cloud-local.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cloud-local.sh b/bin/cloud-local.sh index e323ef5..8ad5f95 100755 --- a/bin/cloud-local.sh +++ b/bin/cloud-local.sh @@ -100,7 +100,7 @@ function download_packages { if [[ "$kafka_enabled" -eq 1 ]]; then - urls=("${urls[@]}" "${mirror}/kafka/${pkg_kafka_ver}/kafka_${pkg_kafka_scala_ver}-${pkg_kafka_ver}.tgz") + urls=("${urls[@]}" "http://archive.apache.org/dist/kafka/${pkg_kafka_ver}/kafka_${pkg_kafka_scala_ver}-${pkg_kafka_ver}.tgz") fi if [[ "$acc_enabled" -eq 1 ]]; then From af0efa25b13a5242313e14b67e729bf7fa966ff4 Mon Sep 17 00:00:00 2001 From: David Seapy Date: Fri, 2 Mar 2018 12:55:54 -0500 Subject: [PATCH 2/2] Use apache archive server instead of mirror to support old version --- bin/cloud-local.sh | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/bin/cloud-local.sh b/bin/cloud-local.sh index 8ad5f95..98895f3 100755 --- a/bin/cloud-local.sh +++ b/bin/cloud-local.sh @@ -79,28 +79,17 @@ function download_packages { || { rm -f "${file}"; echo "Error downloading: ${file}"; errorList="${errorList} scala-${pkg_scala_ver}.tgz ${NL}"; }; fi - local mirror - if [[ -z ${pkg_src_mirror+x} ]]; then - # If we are using a proxy we should try to always use the same mirror - if [[ ! -z ${http_proxy+x} ]]; then - local mirror=$(curl -s 'https://www.apache.org/dyn/closer.cgi' | grep -o '[^<]*' | sed 's/<[^>]*>//g'|grep -v ftp: |grep .edu/ |sort |head -1) - else - local mirror=$(curl -s 'https://www.apache.org/dyn/closer.cgi' | grep -o '[^<]*' | sed 's/<[^>]*>//g' | head -1) - fi - else - local mirror=${pkg_src_mirror} - fi - echo "Using mirror ${mirror}" + local apache_archive_url="http://archive.apache.org/dist" local maven=${pkg_src_maven} - declare -a urls=("${mirror}/hadoop/common/hadoop-${pkg_hadoop_ver}/hadoop-${pkg_hadoop_ver}.tar.gz" - "${mirror}/zookeeper/zookeeper-${pkg_zookeeper_ver}/zookeeper-${pkg_zookeeper_ver}.tar.gz" - "${mirror}/spark/spark-${pkg_spark_ver}/spark-${pkg_spark_ver}-bin-${pkg_spark_hadoop_ver}.tgz") + declare -a urls=("${apache_archive_url}/hadoop/common/hadoop-${pkg_hadoop_ver}/hadoop-${pkg_hadoop_ver}.tar.gz" + "${apache_archive_url}/zookeeper/zookeeper-${pkg_zookeeper_ver}/zookeeper-${pkg_zookeeper_ver}.tar.gz" + "${apache_archive_url}/spark/spark-${pkg_spark_ver}/spark-${pkg_spark_ver}-bin-${pkg_spark_hadoop_ver}.tgz") if [[ "$kafka_enabled" -eq 1 ]]; then - urls=("${urls[@]}" "http://archive.apache.org/dist/kafka/${pkg_kafka_ver}/kafka_${pkg_kafka_scala_ver}-${pkg_kafka_ver}.tgz") + urls=("${urls[@]}" "${apache_archive_url}/kafka/${pkg_kafka_ver}/kafka_${pkg_kafka_scala_ver}-${pkg_kafka_ver}.tgz") fi if [[ "$acc_enabled" -eq 1 ]]; then @@ -108,11 +97,11 @@ function download_packages { fi if [[ "$hbase_enabled" -eq 1 ]]; then - urls=("${urls[@]}" "${mirror}/hbase/${pkg_hbase_ver}/hbase-${pkg_hbase_ver}-bin.tar.gz") + urls=("${urls[@]}" "${apache_archive_url}/hbase/${pkg_hbase_ver}/hbase-${pkg_hbase_ver}-bin.tar.gz") fi if [[ "$zeppelin_enabled" -eq 1 ]]; then - urls=("${urls[@]}" "${mirror}zeppelin/zeppelin-${pkg_zeppelin_ver}/zeppelin-${pkg_zeppelin_ver}-bin-all.tgz") + urls=("${urls[@]}" "${apache_archive_url}zeppelin/zeppelin-${pkg_zeppelin_ver}/zeppelin-${pkg_zeppelin_ver}-bin-all.tgz") fi for x in "${urls[@]}"; do