Skip to content

[HUDI-359] Add hudi-env for hudi-cli module #1042

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

Merged
vinothchandar merged 7 commits into from
Nov 25, 2019
Merged

[HUDI-359] Add hudi-env for hudi-cli module #1042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c000e32
[HUDI-359] Add hudi-env for hudi-cli module
hddong Nov 22, 2019
ef68579
Create hudi-env.sh
hddong Nov 22, 2019
0b3f630
Delete hudi-env.sh
hddong Nov 22, 2019
a62e3fd
Update hudi-env.sh
hddong Nov 22, 2019
f725192
Update hudi-env.sh
hddong Nov 25, 2019
2742c28
Update hudi-env.sh
hddong Nov 25, 2019
723e6b6
test checks
hddong Nov 25, 2019
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
24 changes: 24 additions & 0 deletions hudi-cli/conf/hudi-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/env bash

################################################################################
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
################################################################################

# Set the necessary environment variables
export HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-"/etc/hadoop/conf"}
export SPARK_CONF_DIR=${SPARK_CONF_DIR:-"/etc/spark/conf"}
export CLIENT_JAR=${CLIENT_JAR}
14 changes: 5 additions & 9 deletions hudi-cli/hudi-cli.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,11 @@

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
HOODIE_JAR=`ls $DIR/target/hudi-cli-*.jar | grep -v source | grep -v javadoc`
if [ -z "$HADOOP_CONF_DIR" ]; then
echo "setting hadoop conf dir"
HADOOP_CONF_DIR="/etc/hadoop/conf"
fi
if [ -z "$SPARK_CONF_DIR" ]; then
echo "setting spark conf dir"
SPARK_CONF_DIR="/etc/spark/conf"
fi

. "${DIR}"/conf/hudi-env.sh

if [ -z "$CLIENT_JAR" ]; then
echo "client jar location not set"
echo "Client jar location not set, please set it in conf/hudi-env.sh"
fi
Copy link
Member

@lamberken lamberken Nov 22, 2019

Choose a reason for hiding this comment

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

hi, may add code snippet is better, WDYT ?

if [ -z "$HADOOP_CONF_DIR" ]; then
  echo "hadoop conf dir not set"
fi
if [ -z "$SPARK_CONF_DIR" ]; then
  echo "spark conf dir not set"
fi

Copy link
Contributor Author

@hddong hddong Nov 25, 2019

Choose a reason for hiding this comment

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

hi, may add code snippet is better, WDYT ?

if [ -z "$HADOOP_CONF_DIR" ]; then
  echo "hadoop conf dir not set"
fi
if [ -z "$SPARK_CONF_DIR" ]; then
  echo "spark conf dir not set"
fi

All of they are export with a default path when run hudi-env.sh, so they almost impossible to be null.


java -cp ${HADOOP_CONF_DIR}:${SPARK_CONF_DIR}:$DIR/target/lib/*:$HOODIE_JAR:${CLIENT_JAR} -DSPARK_CONF_DIR=${SPARK_CONF_DIR} -DHADOOP_CONF_DIR=${HADOOP_CONF_DIR} org.springframework.shell.Bootstrap $@