Skip to content

[ZEPPELIN-4987]. Fix the interpreter dependency conflict caused by the CLASSPATH environment variable #3883

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

Closed
xiejiajun wants to merge 16 commits into from
Closed

[ZEPPELIN-4987]. Fix the interpreter dependency conflict caused by the CLASSPATH environment variable #3883

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bb47849
Support S3ConfigStorage of AWS
xiejiajun Mar 12, 2020
dbb6639
Add Aliyun OSS SDK
xiejiajun Mar 12, 2020
5d4b645
Support OSSConfigStorage of Aliyun
xiejiajun Mar 12, 2020
f149c3b
Merge pull request #1 from apache/master
xiejiajun Mar 16, 2020
45af87a
added timeout for getting Thrift client to avoid situations where the…
xiejiajun Mar 20, 2020
6ef9b23
Merge pull request #3 from apache/master
xiejiajun Mar 23, 2020
9cc70fe
Merge remote-tracking branch 'origin/master'
xiejiajun May 26, 2020
fc59f57
Merge pull request #4 from apache/master
xiejiajun May 26, 2020
1335d55
Merge remote-tracking branch 'origin/master'
xiejiajun May 26, 2020
be36b37
合并Apache Master分支冲突解决
xiejiajun Jun 18, 2020
0a9af6c
Merge branch 'master' of https://github.com/apache/zeppelin into apac…
xiejiajun Jul 6, 2020
5569788
Merge branch 'master' of https://github.com/apache/zeppelin into apac…
xiejiajun Jul 7, 2020
ab2b191
Merge branch 'master' of https://github.com/apache/zeppelin into apac…
xiejiajun Jul 21, 2020
d243d79
Merge branch 'master' of https://github.com/apache/zeppelin into apac…
xiejiajun Aug 19, 2020
3b3e8aa
Fix the interpreter dependency conflict caused by the CLASSPATH envir…
xiejiajun Aug 19, 2020
a160f76
Remove irrelevant file
xiejiajun Aug 19, 2020
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
10 changes: 5 additions & 5 deletions bin/zeppelin-daemon.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ if [[ "${USE_HADOOP}" == "true" ]]; then
fi
fi

CLASSPATH+=":${ZEPPELIN_CLASSPATH}"
ZEPPELIN_SERVER_CLASSPATH="${CLASSPATH}:${ZEPPELIN_CLASSPATH}"

if [[ "${ZEPPELIN_NICENESS}" = "" ]]; then
export ZEPPELIN_NICENESS=0
Expand Down Expand Up @@ -182,9 +182,9 @@ function upstart() {
# where the service manager starts and stops the process
initialize_default_directories

echo "ZEPPELIN_CLASSPATH: ${ZEPPELIN_CLASSPATH_OVERRIDES}:${CLASSPATH}" >> "${ZEPPELIN_OUTFILE}"
echo "ZEPPELIN_CLASSPATH: ${ZEPPELIN_CLASSPATH_OVERRIDES}:${ZEPPELIN_SERVER_CLASSPATH}" >> "${ZEPPELIN_OUTFILE}"

$ZEPPELIN_RUNNER $JAVA_OPTS -cp $ZEPPELIN_CLASSPATH_OVERRIDES:$CLASSPATH $ZEPPELIN_MAIN >> "${ZEPPELIN_OUTFILE}"
$ZEPPELIN_RUNNER $JAVA_OPTS -cp $ZEPPELIN_CLASSPATH_OVERRIDES:$ZEPPELIN_SERVER_CLASSPATH $ZEPPELIN_MAIN >> "${ZEPPELIN_OUTFILE}"
}

function start() {
Expand All @@ -200,9 +200,9 @@ function start() {

initialize_default_directories

echo "ZEPPELIN_CLASSPATH: ${ZEPPELIN_CLASSPATH_OVERRIDES}:${CLASSPATH}" >> "${ZEPPELIN_OUTFILE}"
echo "ZEPPELIN_CLASSPATH: ${ZEPPELIN_CLASSPATH_OVERRIDES}:${ZEPPELIN_SERVER_CLASSPATH}" >> "${ZEPPELIN_OUTFILE}"

nohup nice -n $ZEPPELIN_NICENESS $ZEPPELIN_RUNNER $JAVA_OPTS -cp $ZEPPELIN_CLASSPATH_OVERRIDES:$CLASSPATH $ZEPPELIN_MAIN >> "${ZEPPELIN_OUTFILE}" 2>&1 < /dev/null &
nohup nice -n $ZEPPELIN_NICENESS $ZEPPELIN_RUNNER $JAVA_OPTS -cp $ZEPPELIN_CLASSPATH_OVERRIDES:$ZEPPELIN_SERVER_CLASSPATH $ZEPPELIN_MAIN >> "${ZEPPELIN_OUTFILE}" 2>&1 < /dev/null &
pid=$!
if [[ -z "${pid}" ]]; then
action_msg "${ZEPPELIN_NAME} start" "${SET_ERROR}"
Expand Down