Skip to content

Commit

Permalink
Feature/hive hooks (#30)
Browse files Browse the repository at this point in the history
* add path conversion hook to classpath

* write hive-site.xml

* add path conversion to jre ext directory

* update waggle-dance version

* add hive-hook jar from maven

* update changelog

* Update CHANGELOG.md

* Update CHANGELOG.md

Co-authored-by: Raj Poluri <rpoluri@expediagroup.com>
  • Loading branch information
rpoluri and Raj Poluri authored Mar 18, 2021
1 parent 6003111 commit b4b7de4
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [1.8.0] - 2021-03-18
### Added
- Add apiary extensions hive-hook jar to replace s3 paths as alluxio paths.

## [1.7.1] - 2021-03-15
### Changed
- Upgrade Waggle Dance version to `3.9.3` (was `3.9.1`) to fix NullPointerException in `get_privilege_set` call.
Expand Down
10 changes: 7 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@

FROM amazonlinux:latest

ENV JAVA_VERSION 1.8.0
ENV WAGGLE_DANCE_VERSION 3.9.3
ARG JAVA_VERSION=1.8.0
ARG WAGGLE_DANCE_VERSION=3.9.3
ARG APIARY_EXTENSIONS_VERSION=7.2.0

ENV WAGGLE_DANCE_HOME /opt/waggle-dance

RUN yum -y update && \
Expand All @@ -14,10 +16,12 @@ RUN yum -y update && \
wget \
util-linux \
jq \
http://search.maven.org/remotecontent?filepath=com/hotels/waggle-dance-rpm/"${WAGGLE_DANCE_VERSION}"/waggle-dance-rpm-"${WAGGLE_DANCE_VERSION}".rpm \
https://repo1.maven.org/maven2/com/hotels/waggle-dance-rpm/${WAGGLE_DANCE_VERSION}/waggle-dance-rpm-${WAGGLE_DANCE_VERSION}.rpm \
&& yum clean all \
&& rm -rf /var/cache/yum

ADD https://repo1.maven.org/maven2/com/expediagroup/apiary/hive-hooks/${APIARY_EXTENSIONS_VERSION}/hive-hooks-${APIARY_EXTENSIONS_VERSION}.jar "${WAGGLE_DANCE_HOME}"/jars/

COPY files/waggle-dance-server.yml "${WAGGLE_DANCE_HOME}"/conf/
COPY files/waggle-dance-federation.yml "${WAGGLE_DANCE_HOME}"/conf/
COPY files/waggle-dance-core-latest-exec.conf "${WAGGLE_DANCE_HOME}"/service/
Expand Down
Binary file added files/path-conversion-hook-7.2.0-SNAPSHOT.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion files/waggle-dance-core-latest-exec.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# Spring boot service conf: see http://docs.spring.io/spring-boot/docs/current/reference/html/deployment-install.html#deployment-script-customization-conf-file

LOG_FOLDER=/var/log/waggle-dance/
JAVA_OPTS="-XshowSettings:vm -Xms${HEAPSIZE}m -Xmx${HEAPSIZE}m -XX:+UseG1GC -XX:G1ReservePercent=15 -Dlog4j.configurationFile=/opt/waggle-dance/conf/log4j2.xml -Dlogging.config=/opt/waggle-dance/conf/log4j2.xml"
JAVA_OPTS="-Dloader.path=/opt/waggle-dance/jars -XshowSettings:vm -Xms${HEAPSIZE}m -Xmx${HEAPSIZE}m -XX:+UseG1GC -XX:G1ReservePercent=15 -Dlog4j.configurationFile=/opt/waggle-dance/conf/log4j2.xml -Dlogging.config=/opt/waggle-dance/conf/log4j2.xml"
RUN_ARGS="--server-config=/opt/waggle-dance/conf/waggle-dance-server.yml --federation-config=/opt/waggle-dance/conf/waggle-dance-federation.yml"
2 changes: 2 additions & 0 deletions scripts/startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ fi

source "${WAGGLE_DANCE_HOME}"/service/waggle-dance-core-latest-exec.conf

[[ -n $HIVE_SITE_XML ]] && echo $HIVE_SITE_XML|base64 -d > ${WAGGLE_DANCE_HOME}/jars/hive-site.xml

exec java $JAVA_OPTS -jar "${WAGGLE_DANCE_HOME}"/service/waggle-dance-core-latest-exec.jar $RUN_ARGS

0 comments on commit b4b7de4

Please sign in to comment.