Repository: incubator-slider Updated Branches: refs/heads/develop ae1077db9 -> ea6eca122
SLIDER-740. Support configurating HBASE_OPTS (Yang Hao via smohanty) Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ea6eca12 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ea6eca12 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ea6eca12 Branch: refs/heads/develop Commit: ea6eca122b8e81703b6ec0a7a739aaf0b8736448 Parents: ae1077d Author: Sumit Mohanty <[email protected]> Authored: Fri Jan 23 09:19:20 2015 -0800 Committer: Sumit Mohanty <[email protected]> Committed: Fri Jan 23 09:19:20 2015 -0800 ---------------------------------------------------------------------- app-packages/hbase/configuration/hbase-env.xml | 1 + app-packages/hbase/package/scripts/params.py | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ea6eca12/app-packages/hbase/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/app-packages/hbase/configuration/hbase-env.xml b/app-packages/hbase/configuration/hbase-env.xml index 554c3c5..79a8276 100644 --- a/app-packages/hbase/configuration/hbase-env.xml +++ b/app-packages/hbase/configuration/hbase-env.xml @@ -105,6 +105,7 @@ export HBASE_PID_DIR={{pid_dir}} # Tell HBase whether it should manage it's own instance of Zookeeper or not. export HBASE_MANAGES_ZK=false +export HBASE_OPTS="$HBASE_OPTS {{hbase_opts}}" {% if security_enabled %} export HBASE_OPTS="$HBASE_OPTS -Djava.security.auth.login.config={{client_jaas_config_file}}" http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ea6eca12/app-packages/hbase/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/app-packages/hbase/package/scripts/params.py b/app-packages/hbase/package/scripts/params.py index fc2b49f..027630b 100644 --- a/app-packages/hbase/package/scripts/params.py +++ b/app-packages/hbase/package/scripts/params.py @@ -41,6 +41,8 @@ metric_prop_file_name = "hadoop-metrics2-hbase.properties" java64_home = config['hostLevelParams']['java_home'] log_dir = config['configurations']['global']['app_log_dir'] +#configuration for HBASE_OPTS +hbase_opts = default('/configurations/hbase-env/hbase_opts', '') master_heapsize = config['configurations']['hbase-env']['hbase_master_heapsize'] regionserver_heapsize = config['configurations']['hbase-env']['hbase_regionserver_heapsize']
