Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Hadoop 2.7 release. Also, more straightforward pkg_pre_download #62

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

New Hadoop 2.7 release. Also, more straightforward pkg_pre_download #62

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f5b0683
New Hadoop 2.7 release. Also, more straightforward pkg_pre_download
Jan 2, 2018
d11c2cb
AHeyne caught my mistake
Jan 2, 2018
212e305
Merge branch 'master' into fcr_new_hadoop
Mar 8, 2018
a7688e0
Merge branch 'master' into fcr_new_hadoop
Mar 8, 2018
0b01e77
Merge branch 'master' into fcr_new_hadoop
jahhulbert-ccri May 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions bin/cloud-local.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ function download_packages {
if [[ ! -z ${pkg_pre_download+x} ]]; then
# Does that folder actually exist?
if [[ -d ${pkg_pre_download} ]] ; then
test -d ${CLOUD_HOME}/pkg || rmdir ${CLOUD_HOME}/pkg
test -h ${CLOUD_HOME}/pkg && rm ${CLOUD_HOME}/pkg
rm -f pkg
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can agree with the simplification but I don't always run commands from the $CLOUD_HOME directory. Should we make it rm -f ${CLOUD_HOME}/pkg to be sure?

ln -s ${pkg_pre_download} ${CLOUD_HOME}/pkg
echo "Skipping downloads... using ${pkg_pre_download}"
return 0
Expand Down Expand Up @@ -98,7 +97,7 @@ function download_packages {
"${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")


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

if [[ "$kafka_enabled" -eq 1 ]]; then
urls=("${urls[@]}" "${mirror}/kafka/${pkg_kafka_ver}/kafka_${pkg_kafka_scala_ver}-${pkg_kafka_ver}.tgz")
fi
Expand All @@ -119,7 +118,7 @@ function download_packages {
fname=$(basename "$x");
echo "fetching ${x}";
wget -c -O "${CLOUD_HOME}/pkg/${fname}" "$x" || { rm -f "${CLOUD_HOME}/pkg/${fname}"; echo "Error Downloading: ${fname}"; errorList="${errorList} ${x} ${NL}"; };
done
done

if [[ -n "${errorList}" ]]; then
echo "Failed to download: ${NL} ${errorList}";
Expand Down
2 changes: 1 addition & 1 deletion conf/cloud-local.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pkg_src_maven="https://repo1.maven.org/maven2"
pkg_accumulo_ver="1.8.1"
pkg_hbase_ver="1.2.6"
# Note pkg_spark_hadoop_ver below if modifying
pkg_hadoop_ver="2.7.4"
pkg_hadoop_ver="2.7.5"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 actually we need to use the "archive" site in general i'll add a ticket for this. That way this would keep working instead of having to upgrade

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#63

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ddseapy yeah, here is the convo

# Note, just the major+minor from Hadoop, not patch level
hadoop_base_ver=${pkg_hadoop_ver:0:3}

Expand Down