You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2015/05/08 23:49:12 UTC
ambari git commit: AMBARI-10978. Enable Accumulo monitor to bind to
all interfaces
Repository: ambari
Updated Branches:
refs/heads/trunk 754692354 -> 23f41d8a7
AMBARI-10978. Enable Accumulo monitor to bind to all interfaces
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/23f41d8a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/23f41d8a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/23f41d8a
Branch: refs/heads/trunk
Commit: 23f41d8a7b2a8816ca092e695d0fe2ddf5b5216e
Parents: 7546923
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Fri May 8 14:49:01 2015 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Fri May 8 14:49:01 2015 -0700
----------------------------------------------------------------------
.../ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml | 6 ++++++
.../1.6.1.2.2.0/package/scripts/accumulo_service.py | 5 ++++-
.../ACCUMULO/1.6.1.2.2.0/package/scripts/params.py | 4 ++++
ambari-web/app/data/HDP2/site_properties.js | 10 ++++++++++
4 files changed, 24 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/23f41d8a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
index ea895e4..a650e4d 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
@@ -92,6 +92,11 @@
<description>Heap size for other Accumulo processes.</description>
</property>
<property>
+ <name>accumulo_monitor_bind_all</name>
+ <value>false</value>
+ <description>Controls whether the monitor binds to all interfaces.</description>
+ </property>
+ <property>
<name>content</name>
<description>The template for a client accumulo-env.sh file.</description>
<value>
@@ -130,6 +135,7 @@ export ACCUMULO_MONITOR_OPTS="-Xmx{{accumulo_monitor_heapsize}}m -Xms{{accumulo_
export ACCUMULO_GC_OPTS="-Xmx{{accumulo_gc_heapsize}}m -Xms{{accumulo_gc_heapsize}}m"
export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true ${ACCUMULO_GENERAL_OPTS}"
export ACCUMULO_OTHER_OPTS="-Xmx{{accumulo_other_heapsize}}m -Xms{{accumulo_other_heapsize}}m ${ACCUMULO_OTHER_OPTS}"
+export ACCUMULO_MONITOR_BIND_ALL={{monitor_bind_str}}
# what do when the JVM runs out of heap memory
export ACCUMULO_KILL_CMD='kill -9 %p'
</value>
http://git-wip-us.apache.org/repos/asf/ambari/blob/23f41d8a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py
index 4ba662f..f1385e0 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py
@@ -36,7 +36,10 @@ def accumulo_service( name,
not_if=pid_exists,
user=params.accumulo_user
)
- daemon_cmd = format("{daemon_script} {role} --address {params.hostname} > {log_dir}/accumulo-{role}.out 2>{log_dir}/accumulo-{role}.err & echo $! > {pid_file}")
+ address = params.hostname
+ if name == 'monitor' and params.accumulo_monitor_bind_all:
+ address = '0.0.0.0'
+ daemon_cmd = format("{daemon_script} {role} --address {address} > {log_dir}/accumulo-{role}.out 2>{log_dir}/accumulo-{role}.err & echo $! > {pid_file}")
Execute ( daemon_cmd,
not_if=pid_exists,
user=params.accumulo_user
http://git-wip-us.apache.org/repos/asf/ambari/blob/23f41d8a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
index 47cc4fa..7a3401e 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
@@ -72,6 +72,10 @@ accumulo_tserver_heapsize = config['configurations']['accumulo-env']['accumulo_t
accumulo_monitor_heapsize = config['configurations']['accumulo-env']['accumulo_monitor_heapsize']
accumulo_gc_heapsize = config['configurations']['accumulo-env']['accumulo_gc_heapsize']
accumulo_other_heapsize = config['configurations']['accumulo-env']['accumulo_other_heapsize']
+accumulo_monitor_bind_all = config['configurations']['accumulo-env']['accumulo_monitor_bind_all']
+monitor_bind_str = "false"
+if accumulo_monitor_bind_all:
+ monitor_bind_str = "true"
env_sh_template = config['configurations']['accumulo-env']['content']
server_env_sh_template = config['configurations']['accumulo-env']['server_content']
http://git-wip-us.apache.org/repos/asf/ambari/blob/23f41d8a/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index f6fba99..2c50819 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -2080,6 +2080,16 @@ var hdp2properties = [
"category": "Advanced accumulo-env"
},
{
+ "id": "puppet var",
+ "name": "accumulo_monitor_bind_all",
+ "displayName": "Monitor Bind All Interfaces",
+ "displayType": "checkbox",
+ "defaultValue": false,
+ "serviceName": "ACCUMULO",
+ "filename": "accumulo-env.xml",
+ "category": "Advanced accumulo-env"
+ },
+ {
"id": "site property",
"name": "instance.volumes",
"displayName": "instance.volumes",