Repository: ambari Updated Branches: refs/heads/trunk ee9f52421 -> 40b5a39f0
AMBARI-8692. Hadoop sink is not loaded by services. (mpapirkovskyy) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/40b5a39f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/40b5a39f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/40b5a39f Branch: refs/heads/trunk Commit: 40b5a39f0b9dc02789b1facfa2568dbf4dbdd413 Parents: ee9f524 Author: Myroslav Papirkovskyy <mpapyrkovs...@hortonworks.com> Authored: Fri Dec 12 23:20:39 2014 +0200 Committer: Myroslav Papirkovskyy <mpapyrkovs...@hortonworks.com> Committed: Fri Dec 12 23:21:11 2014 +0200 ---------------------------------------------------------------------- ambari-metrics/ambari-metrics-flume-sink/pom.xml | 7 ++++--- ambari-metrics/ambari-metrics-hadoop-sink/pom.xml | 8 +++++--- ambari-metrics/ambari-metrics-host-monitoring/pom.xml | 4 ++++ ambari-metrics/ambari-metrics-storm-sink/pom.xml | 7 ++++--- .../before-START/templates/hadoop-metrics2.properties.j2 | 1 + .../hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 1 + .../HDP/2.2/services/HBASE/configuration/hbase-env.xml | 3 --- .../HDP/2.2/services/HDFS/configuration/hadoop-env.xml | 3 --- 8 files changed, 19 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/40b5a39f/ambari-metrics/ambari-metrics-flume-sink/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-flume-sink/pom.xml b/ambari-metrics/ambari-metrics-flume-sink/pom.xml index 3021438..1eca23e 100644 --- a/ambari-metrics/ambari-metrics-flume-sink/pom.xml +++ b/ambari-metrics/ambari-metrics-flume-sink/pom.xml @@ -121,12 +121,13 @@ limitations under the License. <copyright>2012, Apache Software Foundation</copyright> <group>Development</group> <description>Maven Recipe: RPM Package.</description> + <defaultDirmode>755</defaultDirmode> + <defaultFilemode>644</defaultFilemode> + <defaultUsername>root</defaultUsername> + <defaultGroupname>root</defaultGroupname> <mappings> <mapping> <directory>/usr/lib/flume/lib</directory> - <filemode>644</filemode> - <username>root</username> - <groupname>root</groupname> <sources> <source> <location>target/${project.artifactId}-${project.version}.jar</location> http://git-wip-us.apache.org/repos/asf/ambari/blob/40b5a39f/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml index 3ab9079..56ea2e4 100644 --- a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml +++ b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml @@ -130,6 +130,11 @@ limitations under the License. <group>Development</group> <description>Maven Recipe: RPM Package.</description> + <defaultDirmode>755</defaultDirmode> + <defaultFilemode>644</defaultFilemode> + <defaultUsername>root</defaultUsername> + <defaultGroupname>root</defaultGroupname> + <postinstallScriptlet> <scriptFile>${project.build.outputDirectory}/rpm/postinstall.sh</scriptFile> <fileEncoding>utf-8</fileEncoding> @@ -138,9 +143,6 @@ limitations under the License. <mappings> <mapping> <directory>/usr/lib/ambari-metrics-hadoop-sink</directory> - <filemode>644</filemode> - <username>root</username> - <groupname>root</groupname> <sources> <source> <location>target/${project.artifactId}-with-common-${project.version}.jar</location> http://git-wip-us.apache.org/repos/asf/ambari/blob/40b5a39f/ambari-metrics/ambari-metrics-host-monitoring/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-host-monitoring/pom.xml b/ambari-metrics/ambari-metrics-host-monitoring/pom.xml index ce396df..206f225 100644 --- a/ambari-metrics/ambari-metrics-host-monitoring/pom.xml +++ b/ambari-metrics/ambari-metrics-host-monitoring/pom.xml @@ -129,6 +129,10 @@ <scriptFile>src/main/package/rpm/preremove.sh</scriptFile> <fileEncoding>utf-8</fileEncoding> </preremoveScriptlet> + <defaultDirmode>755</defaultDirmode> + <defaultFilemode>644</defaultFilemode> + <defaultUsername>root</defaultUsername> + <defaultGroupname>root</defaultGroupname> <mappings> <mapping> <directory>${resmonitor.install.dir}</directory> http://git-wip-us.apache.org/repos/asf/ambari/blob/40b5a39f/ambari-metrics/ambari-metrics-storm-sink/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-storm-sink/pom.xml b/ambari-metrics/ambari-metrics-storm-sink/pom.xml index 9b8960c..d9d1051 100644 --- a/ambari-metrics/ambari-metrics-storm-sink/pom.xml +++ b/ambari-metrics/ambari-metrics-storm-sink/pom.xml @@ -121,12 +121,13 @@ limitations under the License. <copyright>2012, Apache Software Foundation</copyright> <group>Development</group> <description>Maven Recipe: RPM Package.</description> + <defaultDirmode>755</defaultDirmode> + <defaultFilemode>644</defaultFilemode> + <defaultUsername>root</defaultUsername> + <defaultGroupname>root</defaultGroupname> <mappings> <mapping> <directory>/usr/lib/storm/lib</directory> - <filemode>644</filemode> - <username>root</username> - <groupname>root</groupname> <sources> <source> <location>target/${project.artifactId}-${project.version}.jar</location> http://git-wip-us.apache.org/repos/asf/ambari/blob/40b5a39f/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2 index 6af1a67..879c797 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2 +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2 @@ -67,6 +67,7 @@ resourcemanager.sink.ganglia.tagsForPrefix.yarn=Queue {% if has_metric_collector %} *.period=60 +*.sink.timeline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar *.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink *.sink.timeline.period=10 datanode.sink.timeline.collector={{metric_collector_host}}:8188 http://git-wip-us.apache.org/repos/asf/ambari/blob/40b5a39f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 index 3a0aaf6..b07378b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 @@ -53,6 +53,7 @@ hbase.extendedperiod = 3600 # If this variable is left out, then the default is no expiration. hbase.extendedperiod = 3600 +*.sink.timline*.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar hbase.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink hbase.period=10 hbase.collector={{metric_collector_host}}:8188 http://git-wip-us.apache.org/repos/asf/ambari/blob/40b5a39f/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml index 9f37dd4..f9c5885 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml @@ -74,9 +74,6 @@ export HBASE_CONF_DIR=${HBASE_CONF_DIR:-{{hbase_conf_dir}}} # Extra Java CLASSPATH elements. Optional. export HBASE_CLASSPATH=${HBASE_CLASSPATH} -if [ -f "/usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar" ]; then - export HBASE_CLASSPATH=${HBASE_CLASSPATH}:/usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar -fi # The maximum amount of heap to use, in MB. Default is 1000. # export HBASE_HEAPSIZE=1000 http://git-wip-us.apache.org/repos/asf/ambari/blob/40b5a39f/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml index 81eb04c..fcb2021 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml @@ -134,9 +134,6 @@ if [ -d "/usr/hdp/current/tez-client" ]; then fi fi -if [ -f "/usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar" ]; then - export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:/usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar -fi # Setting path to hdfs command line export HADOOP_LIBEXEC_DIR={{hadoop_libexec_dir}}
