Repository: incubator-slider Updated Branches: refs/heads/develop 89ddfed77 -> 8dc94a721
Use default() to retrieve optional parameters Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8dc94a72 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8dc94a72 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8dc94a72 Branch: refs/heads/develop Commit: 8dc94a7211b66048f8c932588686b3669e806447 Parents: 89ddfed Author: tedyu <[email protected]> Authored: Wed Apr 8 17:20:48 2015 -0700 Committer: tedyu <[email protected]> Committed: Wed Apr 8 17:20:48 2015 -0700 ---------------------------------------------------------------------- app-packages/hbase/package/scripts/params.py | 36 +++++++++++------------ 1 file changed, 17 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8dc94a72/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 45127d5..5a7f122 100644 --- a/app-packages/hbase/package/scripts/params.py +++ b/app-packages/hbase/package/scripts/params.py @@ -69,25 +69,23 @@ if not metric_collector_lib: has_metric_collector = 0 rest_port = config['configurations']['global']['hbase_rest_port'] -rest_infoport = config['configurations']['global']['hbase_rest_infoport'] -rest_readonly = config['configurations']['global']['hbase_rest_readonly'] - -thrift_port = config['configurations']['global']['hbase_thrift_port'] -thrift_keepalive_sec = config['configurations']['global']['hbase_thrift_keepalive_sec'] -thrift_infoport = config['configurations']['global']['hbase_thrift_infoport'] -thrift_nonblocking = config['configurations']['global']['hbase_thrift_nonblocking'] -thrift_minWorkers = config['configurations']['global']['hbase_thrift_minWorkers'] -thrift_queue = config['configurations']['global']['hbase_thrift_queue'] -if is_empty(thrift_queue): - thrift_queue = "" -thrift_workers = config['configurations']['global']['hbase_thrift_workers'] -thrift_compact = config['configurations']['global']['hbase_thrift_compact'] -thrift_framed = config['configurations']['global']['hbase_thrift_framed'] -thrift2_port = config['configurations']['global']['hbase_thrift2_port'] -thrift2_compact = config['configurations']['global']['hbase_thrift2_compact'] -thrift2_framed = config['configurations']['global']['hbase_thrift2_framed'] -thrift2_infoport = config['configurations']['global']['hbase_thrift2_infoport'] -thrift2_nonblocking = config['configurations']['global']['hbase_thrift2_nonblocking'] +rest_infoport = default('/configurations/global/hbase_rest_infoport', '') +rest_readonly = default('/configurations/global/hbase_rest_readonly', '') + +thrift_port = default('/configurations/global/hbase_thrift_port', '') +thrift_keepalive_sec = default('/configurations/global/hbase_thrift_keepalive_sec', '') +thrift_infoport = default('/configurations/global/hbase_thrift_infoport', '') +thrift_nonblocking = default('/configurations/global/hbase_thrift_nonblocking', '') +thrift_minWorkers = default('/configurations/global/hbase_thrift_minWorkers', '') +thrift_queue = default('/configurations/global/hbase_thrift_queue', '') +thrift_workers = default('/configurations/global/hbase_thrift_workers', '') +thrift_compact = default('/configurations/global/hbase_thrift_compact', '') +thrift_framed = default('/configurations/global/hbase_thrift_framed', '') +thrift2_port = default('/configurations/global/hbase_thrift2_port', '') +thrift2_compact = default('/configurations/global/hbase_thrift2_compact', '') +thrift2_framed = default('/configurations/global/hbase_thrift2_framed', '') +thrift2_infoport = default('/configurations/global/hbase_thrift2_infoport', '') +thrift2_nonblocking = default('/configurations/global/hbase_thrift2_nonblocking', '') if security_enabled: _hostname_lowercase = config['hostname'].lower()
