Repository: incubator-slider Updated Branches: refs/heads/develop a91082445 -> aa4299e38
SLIDER-732 Allow more parameters to be passed to HBase thrift2 gateway Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/aa4299e3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/aa4299e3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/aa4299e3 Branch: refs/heads/develop Commit: aa4299e38ffdcf15ea8cd32d01c53f6f393e1e9f Parents: a910824 Author: tedyu <[email protected]> Authored: Mon Dec 29 10:01:59 2014 -0800 Committer: tedyu <[email protected]> Committed: Mon Dec 29 10:01:59 2014 -0800 ---------------------------------------------------------------------- app-packages/hbase/package/scripts/hbase_service.py | 14 +++++++++++++- app-packages/hbase/package/scripts/params.py | 4 ++++ 2 files changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aa4299e3/app-packages/hbase/package/scripts/hbase_service.py ---------------------------------------------------------------------- diff --git a/app-packages/hbase/package/scripts/hbase_service.py b/app-packages/hbase/package/scripts/hbase_service.py index ff67670..48034e7 100644 --- a/app-packages/hbase/package/scripts/hbase_service.py +++ b/app-packages/hbase/package/scripts/hbase_service.py @@ -70,7 +70,19 @@ def hbase_service( nonblocking = " -nonblocking" daemon_cmd = format("{daemon_cmd} -p {thrift_port}" + queue + workers + compact + framed + infoport + keepalive_sec + minWorkers + nonblocking) elif name == 'thrift2': - daemon_cmd = format("{daemon_cmd} -p {thrift2_port}") + compact = "" + if not thrift2_compact == "": + compact = " -c" + framed = "" + if not thrift2_framed == "": + framed = " -f" + infoport = "" + if not thrift2_infoport == "": + infoport = " --infoport {thrift2_infoport}" + nonblocking = "" + if not thrift2_nonblocking == "": + nonblocking = " -nonblocking" + daemon_cmd = format("{daemon_cmd} -p {thrift2_port}" + compact + framed + infoport + nonblocking) no_op_test = format("ls {pid_file} >/dev/null 2>&1 && ps `cat {pid_file}` >/dev/null 2>&1") elif action == 'stop': daemon_cmd = format("env HBASE_IDENT_STRING={hbase_user} {cmd} stop {role} && rm -f {pid_file}") http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aa4299e3/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 b6ab915..fc2b49f 100644 --- a/app-packages/hbase/package/scripts/params.py +++ b/app-packages/hbase/package/scripts/params.py @@ -76,6 +76,10 @@ 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'] if security_enabled: _hostname_lowercase = config['hostname'].lower()
