SLIDER-254 fix some issues with accumulo process startup
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/31784988 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/31784988 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/31784988 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: 31784988d67dfd5a9ea02e0d3faf15e82a0d152d Parents: 5510e13 Author: Billie Rinaldi <billie.rina...@gmail.com> Authored: Fri Aug 22 10:39:43 2014 -0700 Committer: Billie Rinaldi <billie.rina...@gmail.com> Committed: Fri Aug 22 10:39:43 2014 -0700 ---------------------------------------------------------------------- app-packages/accumulo/package/scripts/accumulo_service.py | 2 +- app-packages/accumulo/package/scripts/params.py | 2 +- app-packages/accumulo/package/templates/accumulo-env.sh.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/31784988/app-packages/accumulo/package/scripts/accumulo_service.py ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/package/scripts/accumulo_service.py b/app-packages/accumulo/package/scripts/accumulo_service.py index 562ef5d..ca21cc8 100644 --- a/app-packages/accumulo/package/scripts/accumulo_service.py +++ b/app-packages/accumulo/package/scripts/accumulo_service.py @@ -30,7 +30,7 @@ def accumulo_service( name, pid_exists = format("ls {pid_file} >/dev/null 2>&1 && ps `cat {pid_file}` >/dev/null 2>&1") if action == 'start': - daemon_cmd = format("{daemon_script} {role} > {log_dir}/accumulo-{accumulo_user}-{role}.out 2>{log_dir}/accumulo-{accumulo_user}-{role}.err & echo $! > {pid_file}") + daemon_cmd = format("{daemon_script} {role} --address {params.hostname} > {log_dir}/accumulo-{accumulo_user}-{role}.out 2>{log_dir}/accumulo-{accumulo_user}-{role}.err & echo $! > {pid_file}") Execute ( daemon_cmd, not_if=pid_exists, user=params.accumulo_user http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/31784988/app-packages/accumulo/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/package/scripts/params.py b/app-packages/accumulo/package/scripts/params.py index 5cef7eb..7d0e52d 100644 --- a/app-packages/accumulo/package/scripts/params.py +++ b/app-packages/accumulo/package/scripts/params.py @@ -23,7 +23,7 @@ import status_params # server configurations config = Script.get_config() -hostname = config["hostname"] +hostname = config["public_hostname"] # user and status accumulo_user = status_params.accumulo_user http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/31784988/app-packages/accumulo/package/templates/accumulo-env.sh.j2 ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/package/templates/accumulo-env.sh.j2 b/app-packages/accumulo/package/templates/accumulo-env.sh.j2 index 7ffec53..9e365af 100755 --- a/app-packages/accumulo/package/templates/accumulo-env.sh.j2 +++ b/app-packages/accumulo/package/templates/accumulo-env.sh.j2 @@ -36,7 +36,7 @@ export ACCUMULO_TSERVER_OPTS="-Xmx{{tserver_heapsize}} -Xms{{tserver_heapsize}}" export ACCUMULO_MASTER_OPTS="-Xmx{{master_heapsize}} -Xms{{master_heapsize}}" export ACCUMULO_MONITOR_OPTS="-Xmx{{monitor_heapsize}} -Xms{{monitor_heapsize}}" export ACCUMULO_GC_OPTS="-Xmx{{gc_heapsize}} -Xms{{gc_heapsize}}" -export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75" +export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true" export ACCUMULO_OTHER_OPTS="-Xmx{{other_heapsize}} -Xms{{other_heapsize}}" # what do when the JVM runs out of heap memory export ACCUMULO_KILL_CMD='kill -9 %p'
