You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by av...@apache.org on 2017/04/21 19:04:53 UTC
ambari git commit: AMBARI-20553 : Ambari script error for ams-hbase
while writing to Amazon s3 on a cluster with no HDFS. (avijayan)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 6adc5856c -> b16f1fed6
AMBARI-20553 : Ambari script error for ams-hbase while writing to Amazon s3 on a cluster with no HDFS. (avijayan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b16f1fed
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b16f1fed
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b16f1fed
Branch: refs/heads/branch-2.5
Commit: b16f1fed653e220cb93f999d70c583864fd49a24
Parents: 6adc585
Author: Aravindan Vijayan <av...@hortonworks.com>
Authored: Fri Apr 21 12:04:12 2017 -0700
Committer: Aravindan Vijayan <av...@hortonworks.com>
Committed: Fri Apr 21 12:04:12 2017 -0700
----------------------------------------------------------------------
.../conf/unix/ambari-metrics-collector | 3 ++-
.../AMBARI_METRICS/0.1.0/configuration/ams-env.xml | 11 +++++++++++
.../AMBARI_METRICS/0.1.0/package/scripts/hbase.py | 11 ++++++++++-
.../AMBARI_METRICS/0.1.0/package/scripts/params.py | 4 ++++
4 files changed, 27 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b16f1fed/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
index c106235..552be48 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
+++ b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
@@ -38,6 +38,7 @@ METRIC_COLLECTOR=ambari-metrics-collector
NORMALIZER_ENABLED_STUB_FILE=/var/run/ambari-metrics-collector/normalizer_enabled
FIFO_ENABLED_STUB_FILE=/var/run/ambari-metrics-collector/fifo_enabled
+COLLECTOR_ADDITIONAL_CLASSPATH=
STOP_TIMEOUT=5
@@ -256,7 +257,7 @@ function start()
rm -f "${PIDFILE}" >/dev/null 2>&1
fi
- nohup "${JAVA}" "-Xms$AMS_COLLECTOR_HEAPSIZE" "-Xmx$AMS_COLLECTOR_HEAPSIZE" ${AMS_COLLECTOR_OPTS} "-cp" "/usr/lib/ambari-metrics-collector/*:${COLLECTOR_CONF_DIR}" "-Djava.net.preferIPv4Stack=true" "-Dams.log.dir=${AMS_COLLECTOR_LOG_DIR}" "-Dproc_${DAEMON_NAME}" "${CLASS}" "$@" > $OUTFILE 2>&1 &
+ nohup "${JAVA}" "-Xms$AMS_COLLECTOR_HEAPSIZE" "-Xmx$AMS_COLLECTOR_HEAPSIZE" ${AMS_COLLECTOR_OPTS} "-cp" "/usr/lib/ambari-metrics-collector/*:${COLLECTOR_CONF_DIR}:${COLLECTOR_ADDITIONAL_CLASSPATH}" "-Djava.net.preferIPv4Stack=true" "-Dams.log.dir=${AMS_COLLECTOR_LOG_DIR}" "-Dproc_${DAEMON_NAME}" "${CLASS}" "$@" > $OUTFILE 2>&1 &
PID=$!
write_pidfile "${PIDFILE}"
sleep 2
http://git-wip-us.apache.org/repos/asf/ambari/blob/b16f1fed/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
index 81fa4c7..46254ee 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
@@ -112,6 +112,15 @@
<on-ambari-upgrade add="true"/>
</property>
<property>
+ <name>ams_classpath_additional</name>
+ <value/>
+ <description>Additional directory or jars in classpath for Metrics Collector.</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
+ <on-ambari-upgrade add="true"/>
+ </property>
+ <property>
<name>content</name>
<display-name>ams-env template</display-name>
<value>
@@ -157,6 +166,8 @@ export AMS_COLLECTOR_OPTS="$AMS_COLLECTOR_OPTS $AMS_COLLECTOR_GC_OPTS"
# Metrics collector host will be blacklisted for specified number of seconds if metric monitor failed to connect to it.
export AMS_FAILOVER_STRATEGY_BLACKLISTED_INTERVAL={{failover_strategy_blacklisted_interval}}
+# Extra Java CLASSPATH elements for Metrics Collector. Optional.
+export COLLECTOR_ADDITIONAL_CLASSPATH={{ams_classpath_additional}}
</value>
<value-attributes>
<type>content</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b16f1fed/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
index 26b3502..c783d94 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
@@ -113,6 +113,15 @@ def hbase(name=None # 'master' or 'regionserver' or 'client'
create_parents = True
)
+ if params.hbase_wal_dir:
+ Directory(params.hbase_wal_dir,
+ owner=params.hbase_user,
+ group = params.user_group,
+ cd_access="a",
+ create_parents = True,
+ recursive_ownership = True,
+ )
+
merged_ams_hbase_site = {}
merged_ams_hbase_site.update(params.config['configurations']['ams-hbase-site'])
if params.security_enabled:
@@ -203,7 +212,7 @@ def hbase(name=None # 'master' or 'regionserver' or 'client'
if not params.is_local_fs_rootdir:
# If executing Stop All, HDFS is probably down
- if action != 'stop':
+ if action != 'stop' and not params.skip_create_hbase_root_dir:
params.HdfsResource(params.hbase_root_dir,
type="directory",
http://git-wip-us.apache.org/repos/asf/ambari/blob/b16f1fed/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
index 47c301e..c5dce8a 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
@@ -329,6 +329,10 @@ ams_grafana_env_sh_template = config['configurations']['ams-grafana-env']['conte
ams_grafana_ini_template = config['configurations']['ams-grafana-ini']['content']
hbase_staging_dir = default("/configurations/ams-hbase-site/hbase.bulkload.staging.dir", "/amshbase/staging")
+skip_create_hbase_root_dir = default("/configurations/ams-site/timeline.metrics.skip.create.hbase.root.dir", False)
+hbase_wal_dir = default("/configurations/ams-hbase-site/hbase.wal.dir", None)
+if hbase_wal_dir and re.search("^file://|/", hbase_wal_dir): #If wal dir is on local file system, create it.
+ hbase_wal_dir = re.sub("^file://|/", "", hbase_wal_dir, count=1)
#for create_hdfs_directory
hdfs_user_keytab = config['configurations']['hadoop-env']['hdfs_user_keytab']