Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-12021 Hbase shell does not respect the HBASE_OPTS set by the user in console (Ashish Singhi)

This commit is contained in:
stack 2014-09-19 11:06:53 -07:00
parent 7d0f5eba2d
commit 098f8c4401
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/hbase
View File

@ -52,6 +52,9 @@
# JRUBY_OPTS Extra options (eg '--1.9') passed to the hbase shell. # JRUBY_OPTS Extra options (eg '--1.9') passed to the hbase shell.
# Empty by default. # Empty by default.
# #
# HBASE_SHELL_OPTS Extra options passed to the hbase shell.
# Empty by default.
#
bin=`dirname "$0"` bin=`dirname "$0"`
bin=`cd "$bin">/dev/null; pwd` bin=`cd "$bin">/dev/null; pwd`

3
bin/hbase.cmd
View File

@ -42,6 +42,8 @@
@rem @rem
@rem JRUBY_OPTS Extra options (eg '--1.9') passed to the hbase shell. @rem JRUBY_OPTS Extra options (eg '--1.9') passed to the hbase shell.
@rem Empty by default. @rem Empty by default.
@rem HBASE_SHELL_OPTS Extra options passed to the hbase shell.
@rem Empty by default.
setlocal enabledelayedexpansion setlocal enabledelayedexpansion
@ -302,6 +304,7 @@ goto :eof
) else ( ) else (
set HBASE_OPTS=%HBASE_OPTS% -Dhbase.ruby.sources="%HBASE_HOME%\hbase-shell\src\main\ruby" set HBASE_OPTS=%HBASE_OPTS% -Dhbase.ruby.sources="%HBASE_HOME%\hbase-shell\src\main\ruby"
) )
set HBASE_OPTS=%HBASE_OPTS% %HBASE_SHELL_OPTS%
set CLASS=org.jruby.Main -X+O %JRUBY_OPTS% "%HBASE_HOME%\bin\hirb.rb" set CLASS=org.jruby.Main -X+O %JRUBY_OPTS% "%HBASE_HOME%\bin\hirb.rb"
goto :eof goto :eof