Repository: incubator-slider Updated Branches: refs/heads/develop fa73aee3a -> 6fe6ff405
Reference variables from params.py correctly Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6fe6ff40 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6fe6ff40 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6fe6ff40 Branch: refs/heads/develop Commit: 6fe6ff405b750023c88d0d97585d639db8b6847b Parents: fa73aee Author: tedyu <[email protected]> Authored: Wed Apr 15 17:20:27 2015 -0700 Committer: tedyu <[email protected]> Committed: Wed Apr 15 17:20:27 2015 -0700 ---------------------------------------------------------------------- .../hbase/package/scripts/hbase_service.py | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6fe6ff40/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 88e00e9..28f2f49 100644 --- a/app-packages/hbase/package/scripts/hbase_service.py +++ b/app-packages/hbase/package/scripts/hbase_service.py @@ -37,50 +37,50 @@ def hbase_service( daemon_cmd = format("env HBASE_IDENT_STRING={hbase_user} {cmd} start {role}") if name == 'rest': infoport = "" - if not rest_infoport == "": - infoport = " --infoport {rest_infoport}" + if not params.rest_infoport == "": + infoport = " --infoport {params.rest_infoport}" readonly = "" - if not rest_readonly == "": + if not params.rest_readonly == "": readonly = " --readonly" daemon_cmd = format("{daemon_cmd} -p {rest_port}" + infoport + readonly) elif name == 'thrift': queue = "" - if not thrift_queue == "": - queue = " -q {thrift_queue}" + if not params.thrift_queue == "": + queue = " -q {params.thrift_queue}" workers = "" - if not thrift_workers == "": - workers = " -w {thrift_workers}" + if not params.thrift_workers == "": + workers = " -w {params.thrift_workers}" compact = "" - if not thrift_compact == "": + if not params.thrift_compact == "": compact = " -c" framed = "" - if not thrift_framed == "": + if not params.thrift_framed == "": framed = " -f" infoport = "" - if not thrift_infoport == "": - infoport = " --infoport {thrift_infoport}" + if not params.thrift_infoport == "": + infoport = " --infoport {params.thrift_infoport}" keepalive_sec = "" - if not thrift_keepalive_sec == "": - keepalive_sec = " --keepAliveSec {thrift_keepalive_sec}" + if not params.thrift_keepalive_sec == "": + keepalive_sec = " --keepAliveSec {params.thrift_keepalive_sec}" minWorkers = "" - if not thrift_minWorkers == "": - minWorkers = " --minWorkers {thrift_minWorkers}" + if not params.thrift_minWorkers == "": + minWorkers = " --minWorkers {params.thrift_minWorkers}" nonblocking = "" - if not thrift_nonblocking == "": + if not params.thrift_nonblocking == "": nonblocking = " -nonblocking" daemon_cmd = format("{daemon_cmd} -p {thrift_port}" + queue + workers + compact + framed + infoport + keepalive_sec + minWorkers + nonblocking) elif name == 'thrift2': compact = "" - if not thrift2_compact == "": + if not params.thrift2_compact == "": compact = " -c" framed = "" - if not thrift2_framed == "": + if not params.thrift2_framed == "": framed = " -f" infoport = "" - if not thrift2_infoport == "": - infoport = " --infoport {thrift2_infoport}" + if not params.thrift2_infoport == "": + infoport = " --infoport {params.thrift2_infoport}" nonblocking = "" - if not thrift2_nonblocking == "": + if not params.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")
