ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject ambari git commit: AMBARI-9526 AMS : Metric collector fails to start on centos5.9 (dsen)
Date Mon, 09 Feb 2015 17:25:05 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 21a97cc73 -> 5806ec1ec


AMBARI-9526 AMS : Metric collector fails to start on centos5.9 (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5806ec1e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5806ec1e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5806ec1e

Branch: refs/heads/trunk
Commit: 5806ec1ec49b8fc9abcad99df35c2e301638e718
Parents: 21a97cc
Author: Dmytro Sen <dsen@apache.org>
Authored: Mon Feb 9 19:23:57 2015 +0200
Committer: Dmytro Sen <dsen@apache.org>
Committed: Mon Feb 9 19:24:44 2015 +0200

----------------------------------------------------------------------
 ambari-metrics/ambari-metrics-assembly/pom.xml  | 14 +++++++++++++
 .../src/main/assembly/collector.xml             | 22 --------------------
 .../conf/unix/ambari-metrics-collector          |  2 +-
 .../AMS/0.1.0/configuration/ams-env.xml         |  5 +++--
 .../AMS/0.1.0/configuration/ams-hbase-env.xml   |  2 +-
 5 files changed, 19 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5806ec1e/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 1a30527..3cb4487 100644
--- a/ambari-metrics/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics/ambari-metrics-assembly/pom.xml
@@ -154,6 +154,20 @@
                   dest="${project.build.directory}/embedded"
                   compression="gzip"
                   />
+                <!-- Resolving symlinks-->
+                <move todir="${project.build.directory}/embedded/${hadoop.folder}/lib/native/">
+                  <fileset dir="${project.build.directory}/embedded/${hadoop.folder}/lib/native/"/>
+                  <mapper type="regexp" from="libsnappy.so.1.1.*" to="libsnappy.so.1"/>
+                </move>
+                <move
+                  file="${project.build.directory}/embedded/${hadoop.folder}/lib/native/libhdfs.so.0.0.0"
+                  tofile="${project.build.directory}/embedded/${hadoop.folder}/lib/native/libhdfs.so"
+                  />
+                <move
+                  file="${project.build.directory}/embedded/${hadoop.folder}/lib/native/libhadoop.so.1.0.0"
+                  tofile="${project.build.directory}/embedded/${hadoop.folder}/lib/native/libhadoop.so"
+                  />
+                <delete file="${project.build.directory}/embedded/${hadoop.folder}/lib/native/libsnappy.so"/>
               </target>
             </configuration>
           </execution>

http://git-wip-us.apache.org/repos/asf/ambari/blob/5806ec1e/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml
index 67ec6c5..609ddb3 100644
--- a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml
+++ b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml
@@ -53,31 +53,9 @@
     <fileSet>
       <directory>${project.build.directory}/embedded/${hadoop.folder}/lib/native</directory>
       <outputDirectory>hbase/lib/hadoop-native</outputDirectory>
-      <excludes>
-        <exclude>*.so*</exclude>
-      </excludes>
     </fileSet>
   </fileSets>
 
-  <!--TODO due to broken symlinks  -->
-  <files>
-    <file>
-      <source>${project.build.directory}/embedded/${hadoop.folder}/lib/native/libsnappy.so.1.1.4</source>
-      <outputDirectory>hbase/lib/hadoop-native</outputDirectory>
-      <destName>libsnappy.so.1</destName>
-    </file>
-    <file>
-      <source>${project.build.directory}/embedded/${hadoop.folder}/lib/native/libhdfs.so.0.0.0</source>
-      <outputDirectory>hbase/lib/hadoop-native</outputDirectory>
-      <destName>libhdfs.so</destName>
-    </file>
-    <file>
-      <source>${project.build.directory}/embedded/${hadoop.folder}/lib/native/libhadoop.so.1.0.0</source>
-      <outputDirectory>hbase/lib/hadoop-native</outputDirectory>
-      <destName>libhadoop.so</destName>
-    </file>
-  </files>
-
   <dependencySets>
     <dependencySet>
       <unpack>false</unpack>

http://git-wip-us.apache.org/repos/asf/ambari/blob/5806ec1e/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 4ec13da..537f043 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
+++ b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
@@ -228,7 +228,7 @@ case "$1" in
         rm -f "${PIDFILE}" >/dev/null 2>&1
     fi
 
-    nohup "${JAVA}" "-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}" "-cp" "/usr/lib/ambari-metrics-collector/*:${COLLECTOR_CONF_DIR}" "${AMS_COLLECTOR_OPTS}"
"-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/5806ec1e/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml
b/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml
index 4bb82e7..2945de1 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml
@@ -69,9 +69,10 @@ export AMS_MONITOR_PID_DIR={{ams_monitor_pid_dir}}
 # AMS HBase pid directory
 export AMS_HBASE_PID_DIR={{hbase_pid_dir}}
 
-export AMS_COLLECTOR_OPTS=
+# AMS Collector options
+export AMS_COLLECTOR_OPTS="-Djava.library.path=/usr/lib/ams-hbase/lib/hadoop-native"
 {% if security_enabled %}
-export AMS_COLLECTOR_OPTS="-Djava.security.auth.login.config={{ams_collector_jaas_config_file}}"
+export AMS_COLLECTOR_OPTS="$AMS_COLLECTOR_OPTS -Djava.security.auth.login.config={{ams_collector_jaas_config_file}}"
 {% endif %}
 
     </value>

http://git-wip-us.apache.org/repos/asf/ambari/blob/5806ec1e/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-env.xml
b/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-env.xml
index 4b23d2f..38220b1 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-env.xml
@@ -129,7 +129,7 @@ export HBASE_OPTS="$HBASE_OPTS -Djava.library.path=${_HADOOP_NATIVE_LIB}"
 
 {% if disable_hadoop_environment %}
 # Unset HADOOP_HOME to avoid importing HADOOP installed cluster related configs like: /usr/hdp/2.2.0.0-2041/hadoop/conf/
-export HADOOP_HOME=`pwd`	138	export HADOOP_HOME=`pwd`
+export HADOOP_HOME=`pwd`
 {% endif %}
     </value>
   </property>


Mime
View raw message