You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2014/12/26 19:05:56 UTC
ambari git commit: AMBARI-8894. Remove unnecessary dependencies from
flume and storm sinks. (mpapirkovskyy)
Repository: ambari
Updated Branches:
refs/heads/trunk 5659711cf -> 5e35865ed
AMBARI-8894. Remove unnecessary dependencies from flume and storm sinks. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5e35865e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5e35865e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5e35865e
Branch: refs/heads/trunk
Commit: 5e35865ed4f477d6a89bb87ef58e329c3c2a1334
Parents: 5659711
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Fri Dec 26 18:48:57 2014 +0200
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Fri Dec 26 20:05:51 2014 +0200
----------------------------------------------------------------------
ambari-metrics/ambari-metrics-assembly/pom.xml | 87 +++-----------------
.../src/main/package/deb/control/postinst | 25 ++++--
.../src/main/package/rpm/sink/postinstall.sh | 35 ++++++++
.../ambari-metrics-flume-sink/pom.xml | 18 +---
.../src/main/package/rpm/postinstall.sh | 24 ------
.../ambari-metrics-storm-sink/pom.xml | 18 +---
.../common-services/AMS/0.1.0/metainfo.xml | 3 +
.../FLUME/1.4.0.2.0/configuration/flume-env.xml | 6 +-
8 files changed, 74 insertions(+), 142 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e35865e/ambari-metrics/ambari-metrics-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml b/ambari-metrics/ambari-metrics-assembly/pom.xml
index 9eda761..1e020cb 100644
--- a/ambari-metrics/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics/ambari-metrics-assembly/pom.xml
@@ -40,7 +40,9 @@
<deb.python.ver>python (>= 2.6)</deb.python.ver>
<deb.architecture>amd64</deb.architecture>
<deb.dependency.list>${deb.python.ver},python-dev,gcc</deb.dependency.list>
- <sinkJarName>ambari-metrics-hadoop-sink-with-common-${project.version}.jar</sinkJarName>
+ <hadoop.sink.jar>ambari-metrics-hadoop-sink-with-common-${project.version}.jar</hadoop.sink.jar>
+ <storm.sink.jar>ambari-metrics-storm-sink-with-common-${project.version}.jar</storm.sink.jar>
+ <flume.sink.jar>ambari-metrics-flume-sink-with-common-${project.version}.jar</flume.sink.jar>
</properties>
<build>
@@ -177,9 +179,6 @@
<needarch>x86_64</needarch>
<autoRequires>false</autoRequires>
<requires>
- <require>ambari-metrics-hadoop-sink</require>
- <require>ambari-metrics-flume-sink</require>
- <require>ambari-metrics-storm-sink</require>
<require>${python.ver}</require>
<require>gcc</require>
<require>python-devel</require>
@@ -409,7 +408,7 @@
<defaultGroupname>root</defaultGroupname>
<postinstallScriptlet>
- <scriptFile>${hadoop-sink.dir}/target/classes/rpm/postinstall.sh</scriptFile>
+ <scriptFile>${project.basedir}/src/main/package/rpm/sink/postinstall.sh</scriptFile>
<fileEncoding>utf-8</fileEncoding>
</postinstallScriptlet>
@@ -423,75 +422,27 @@
</sources>
</mapping>
-
- </mappings>
- </configuration>
-
- </execution>
-
- <!-- flume-sink -->
- <execution>
- <id>ambari-metrics-flume-sink</id>
- <phase>package</phase>
- <goals>
- <goal>rpm</goal>
- </goals>
- <configuration>
- <name>ambari-metrics-flume-sink</name>
- <copyright>2012, Apache Software Foundation</copyright>
- <group>Development</group>
- <description>Maven Recipe: RPM Package.</description>
- <mappings>
<mapping>
<directory>/usr/lib/flume/lib</directory>
- <filemode>644</filemode>
- <username>root</username>
- <groupname>root</groupname>
<sources>
<source>
- <location>${flume-sink.dir}/target/ambari-metrics-flume-sink-${project.version}.jar</location>
- </source>
- <source>
- <location>${flume-sink.dir}/target/lib</location>
+ <location>${flume-sink.dir}/target/ambari-metrics-flume-sink-with-common-${project.version}.jar</location>
</source>
</sources>
</mapping>
- </mappings>
- </configuration>
- </execution>
-
- <!-- storm-sink -->
- <execution>
- <id>ambari-metrics-storm-sink</id>
- <phase>package</phase>
- <goals>
- <goal>rpm</goal>
- </goals>
-
- <configuration>
- <name>ambari-metrics-storm-sink</name>
- <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>
<sources>
<source>
- <location>${storm-sink.dir}/target/ambari-metrics-storm-sink-${project.version}.jar</location>
- </source>
- <source>
- <location>${storm-sink.dir}/target/lib</location>
+ <location>${storm-sink.dir}/target/ambari-metrics-storm-sink-with-common-${project.version}.jar</location>
</source>
</sources>
</mapping>
</mappings>
</configuration>
+
</execution>
+
</executions>
</plugin>
</plugins>
@@ -730,7 +681,7 @@
<!-- flume sink -->
<data>
- <src>${flume-sink.dir}/target/ambari-metrics-flume-sink-${project.version}.jar</src>
+ <src>${flume-sink.dir}/target/${flume.sink.jar}</src>
<type>file</type>
<mapper>
<type>perm</type>
@@ -739,20 +690,11 @@
<prefix>/usr/lib/flume/lib</prefix>
</mapper>
</data>
- <data>
- <src>${flume-sink.dir}/target/lib</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <filemode>644</filemode>
- <prefix>/usr/lib/flume/lib</prefix>
- </mapper>
- </data>
<!-- storm sink -->
<data>
- <src>${storm-sink.dir}/target/ambari-metrics-storm-sink-${project.version}.jar</src>
+ <src>${storm-sink.dir}/target/${storm.sink.jar}</src>
<type>file</type>
<mapper>
<type>perm</type>
@@ -761,15 +703,6 @@
<prefix>/usr/lib/storm/lib</prefix>
</mapper>
</data>
- <data>
- <src>${storm-sink.dir}/target/lib</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <filemode>644</filemode>
- <prefix>/usr/lib/storm/lib</prefix>
- </mapper>
- </data>
</dataSet>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e35865e/ambari-metrics/ambari-metrics-assembly/src/main/package/deb/control/postinst
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/package/deb/control/postinst b/ambari-metrics/ambari-metrics-assembly/src/main/package/deb/control/postinst
index 8ba25de..1955680 100644
--- a/ambari-metrics/ambari-metrics-assembly/src/main/package/deb/control/postinst
+++ b/ambari-metrics/ambari-metrics-assembly/src/main/package/deb/control/postinst
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -14,11 +14,22 @@
# See the License for the specific language governing permissions and
# limitations under the License
-LINK_NAME="/usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar"
-JAR_NAME="/usr/lib/ambari-metrics-hadoop-sink/${sinkJarName}"
+HADOOP_LINK_NAME="/usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar"
+FLUME_LINK_NAME="/usr/lib/flume/lib/ambari-metrics-flume-sink.jar"
+HADOOP_SINK_JAR="/usr/lib/ambari-metrics-hadoop-sink/${hadoop.sink.jar}"
+FLUME_SINK_JAR="/usr/lib/flume/lib/${flume.sink.jar}"
+#link for storm jar not required with current loading
+#STORM_SINK_JAR="/usr/lib/storm/lib/${storm.sink.jar}"
+#STORM_LINK_NAME="/usr/lib/storm/lib/ambari-metrics-storm-sink.jar"
-if [ -e "$LINK_NAME" ]; then
- rm -f $LINK_NAME
-fi
+JARS=(${HADOOP_SINK_JAR} ${FLUME_SINK_JAR})
+LINKS=(${HADOOP_LINK_NAME} ${FLUME_LINK_NAME})
-ln -s $JAR_NAME $LINK_NAME
+for index in ${!LINKS[*]}
+do
+ if [ -e "${LINKS[$index]}" ]; then
+ rm -f ${LINKS[$index]}
+ fi
+
+ ln -s ${JARS[$index]} ${LINKS[$index]}
+done
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e35865e/ambari-metrics/ambari-metrics-assembly/src/main/package/rpm/sink/postinstall.sh
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/package/rpm/sink/postinstall.sh b/ambari-metrics/ambari-metrics-assembly/src/main/package/rpm/sink/postinstall.sh
new file mode 100644
index 0000000..1955680
--- /dev/null
+++ b/ambari-metrics/ambari-metrics-assembly/src/main/package/rpm/sink/postinstall.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License
+
+HADOOP_LINK_NAME="/usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar"
+FLUME_LINK_NAME="/usr/lib/flume/lib/ambari-metrics-flume-sink.jar"
+HADOOP_SINK_JAR="/usr/lib/ambari-metrics-hadoop-sink/${hadoop.sink.jar}"
+FLUME_SINK_JAR="/usr/lib/flume/lib/${flume.sink.jar}"
+#link for storm jar not required with current loading
+#STORM_SINK_JAR="/usr/lib/storm/lib/${storm.sink.jar}"
+#STORM_LINK_NAME="/usr/lib/storm/lib/ambari-metrics-storm-sink.jar"
+
+JARS=(${HADOOP_SINK_JAR} ${FLUME_SINK_JAR})
+LINKS=(${HADOOP_LINK_NAME} ${FLUME_LINK_NAME})
+
+for index in ${!LINKS[*]}
+do
+ if [ -e "${LINKS[$index]}" ]; then
+ rm -f ${LINKS[$index]}
+ fi
+
+ ln -s ${JARS[$index]} ${LINKS[$index]}
+done
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e35865e/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 22e14c9..789d811 100644
--- a/ambari-metrics/ambari-metrics-flume-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-flume-sink/pom.xml
@@ -31,20 +31,6 @@ limitations under the License.
<build>
<plugins>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/lib</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -114,12 +100,12 @@ limitations under the License.
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-core</artifactId>
<version>1.5.1</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-metrics-common</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e35865e/ambari-metrics/ambari-metrics-hadoop-sink/src/main/package/rpm/postinstall.sh
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/package/rpm/postinstall.sh b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/package/rpm/postinstall.sh
deleted file mode 100644
index 9849899..0000000
--- a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/package/rpm/postinstall.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-LINK_NAME="/usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar"
-JAR_NAME="/usr/lib/ambari-metrics-hadoop-sink/${sinkJarName}"
-
-if [ -e "$LINK_NAME" ]; then
- rm -f $LINK_NAME
-fi
-
-ln -s $JAR_NAME $LINK_NAME
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e35865e/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 ea8f0f1..71458d5 100644
--- a/ambari-metrics/ambari-metrics-storm-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-storm-sink/pom.xml
@@ -31,20 +31,6 @@ limitations under the License.
<build>
<plugins>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/lib</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -114,12 +100,12 @@ limitations under the License.
<groupId>org.apache.storm</groupId>
<artifactId>storm-core</artifactId>
<version>0.9.3</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-metrics-common</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e35865e/ambari-server/src/main/resources/common-services/AMS/0.1.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/metainfo.xml b/ambari-server/src/main/resources/common-services/AMS/0.1.0/metainfo.xml
index 5f07b01..3c87fd7 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/AMS/0.1.0/metainfo.xml
@@ -74,6 +74,9 @@
<name>ambari-metrics-monitor</name>
</package>
<package>
+ <name>ambari-metrics-hadoop-sink</name>
+ </package>
+ <package>
<name>hadoop_2_2_*</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e35865e/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml
index bb56f9c..008e6f4 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml
@@ -69,8 +69,10 @@ export JAVA_HOME={{java_home}}
# export JAVA_OPTS="-Xms100m -Xmx2000m -Dcom.sun.management.jmxremote"
# Note that the Flume conf directory is always included in the classpath.
-#TODO temporary addition
-export FLUME_CLASSPATH=$FLUME_CLASSPATH:/usr/lib/flume/lib/*
+# Add flume sink to classpath
+if [ -e "/usr/lib/flume/lib/ambari-metrics-flume-sink.jar" ]; then
+ export FLUME_CLASSPATH=$FLUME_CLASSPATH:/usr/lib/flume/lib/ambari-metrics-flume-sink.jar
+fi
export HIVE_HOME={{flume_hive_home}}
export HCAT_HOME={{flume_hcat_home}}