Repository: ambari Updated Branches: refs/heads/trunk aad6fdb94 -> 1bddc0364
AMBARI-5066. Ambari Upgrade Test, restart HBase, HBase Client Install failed (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1bddc036 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1bddc036 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1bddc036 Branch: refs/heads/trunk Commit: 1bddc0364f804309b5d19f71a3edd6060ec8de72 Parents: aad6fdb Author: Andrew Onischuk <[email protected]> Authored: Thu Mar 13 05:42:32 2014 -0700 Committer: Andrew Onischuk <[email protected]> Committed: Thu Mar 13 05:49:00 2014 -0700 ---------------------------------------------------------------------- .../stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1bddc036/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py index 1d95320..ba7d3c1 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py @@ -53,7 +53,8 @@ regionserver_xmn_size = calc_xmn_from_xms(regionserver_heapsize, 0.2, 512) pid_dir = status_params.pid_dir tmp_dir = config['configurations']['hbase-site']['hbase.tmp.dir'] -local_dir = substitute_vars(config['configurations']['hbase-site']['hbase.local.dir'], config['configurations']['hbase-site']) +_local_dir_conf = default('/configurations/hbase-site/hbase.local.dir', "${hbase.tmp.dir}/local") +local_dir = substitute_vars(_local_dir_conf, config['configurations']['hbase-site']) client_jaas_config_file = default('hbase_client_jaas_config_file', format("{conf_dir}/hbase_client_jaas.conf")) master_jaas_config_file = default('hbase_master_jaas_config_file', format("{conf_dir}/hbase_master_jaas.conf"))
