Skip to content

DRILL-4870 drill-config.sh sets JAVA_HOME incorrectly for the Mac #605

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
paul-rogers wants to merge 2 commits into from
Closed

DRILL-4870 drill-config.sh sets JAVA_HOME incorrectly for the Mac #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
164a29d
DRILL-4870 drill-config.sh sets JAVA_HOME incorrectly for the Mac
Oct 7, 2016
6ffca98
DRILL-4870: Fixes for review comments
Oct 8, 2016
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
4 changes: 3 additions & 1 deletion distribution/src/resources/drill-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,5 +392,7 @@ export DRILL_HOME
export DRILL_CONF_DIR
export DRILL_LOG_DIR
export CP
export JAVA_HOME
# DRILL-4870: Don't export JAVA_HOME. Java can find it just fine from the java
Copy link
Contributor

@chunhui-shi chunhui-shi Oct 7, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

In drillbit.sh, we refer to JAVA_HOME with this '$JAVA_HOME/bin/jstack', is that piece of code still working after we do not export JAVA_HOME here?
Maybe it is better we limit the impact of not exporting JAVA_HOME to MAC and keep the same behavior on Linux(and other OSes)?

# command. If we attempt to work it out, we do so incorrectly for the Mac.
#export JAVA_HOME
export JAVA
2 changes: 1 addition & 1 deletion distribution/src/resources/drillbit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ waitForProcessEnd()
# process still there : kill -9
if kill -0 $pidKilled > /dev/null 2>&1; then
echo "$commandName did not complete after $origcnt seconds, killing with kill -9 $pidKilled"
$JAVA_HOME/bin/jstack -l $pidKilled > "$logout" 2>&1
`dirname $JAVA`/jstack -l $pidKilled > "$logout" 2>&1
kill -9 $pidKilled > /dev/null 2>&1
fi
}
Expand Down