You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2015/08/25 22:41:12 UTC
[2/2] ambari git commit: AMBARI-12859. AMS cache could result in OOM
in ambari server. (swagle)
AMBARI-12859. AMS cache could result in OOM in ambari server. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e60dbb4e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e60dbb4e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e60dbb4e
Branch: refs/heads/trunk
Commit: e60dbb4e0dbc4be8bf6905dbbd2567a9270aac69
Parents: 153ecfa
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Tue Aug 25 13:41:02 2015 -0700
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Tue Aug 25 13:41:02 2015 -0700
----------------------------------------------------------------------
ambari-server/pom.xml | 24 +
ambari-server/pom.xml.orig | 1977 ------------------
.../server/configuration/Configuration.java | 20 +-
.../timeline/AMSReportPropertyProvider.java | 1 -
.../timeline/cache/TimelineMetricCache.java | 11 +-
.../cache/TimelineMetricCacheEntryFactory.java | 8 +-
.../cache/TimelineMetricCacheProvider.java | 29 +-
.../hadoop-metrics2-hbase.properties.j2 | 8 +-
.../timeline/cache/TimelineMetricCacheTest.java | 15 +-
9 files changed, 94 insertions(+), 1999 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e60dbb4e/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 2e16a59..cf99bee 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1658,11 +1658,23 @@
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-annotations</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-integ</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
@@ -1677,11 +1689,23 @@
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-kerberos-codec</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
http://git-wip-us.apache.org/repos/asf/ambari/blob/e60dbb4e/ambari-server/pom.xml.orig
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml.orig b/ambari-server/pom.xml.orig
deleted file mode 100644
index 48337ea..0000000
--- a/ambari-server/pom.xml.orig
+++ /dev/null
@@ -1,1977 +0,0 @@
-<?xml version="1.0"?>
-<!-- Licensed 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.
- See accompanying LICENSE file. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.ambari</groupId>
- <artifactId>ambari-project</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../ambari-project</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.ambari</groupId>
- <artifactId>ambari-server</artifactId>
- <packaging>${packagingFormat}</packaging>
- <name>Ambari Server</name>
- <version>2.0.0-SNAPSHOT</version>
- <description>Ambari Server</description>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <python.ver>python >= 2.6</python.ver>
- <!-- On centos the python xml's are inside python package -->
- <python.xml.package>${python.ver}</python.xml.package>
- <deb.python.ver>python (>= 2.6)</deb.python.ver>
- <deb.architecture>amd64</deb.architecture>
- <deb.dependency.list>openssl, postgresql (>= 8.1), ${deb.python.ver}, curl</deb.dependency.list>
- <custom.tests>false</custom.tests>
- <hdpUrlForCentos6>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.1.1.0</hdpUrlForCentos6>
- <hdpLatestUrl>http://public-repo-1.hortonworks.com/HDP/hdp_urlinfo.json</hdpLatestUrl>
- <ambari_commons.install.dir>/usr/lib/ambari-server/lib/ambari_commons</ambari_commons.install.dir>
- <resource_management.install.dir>/usr/lib/ambari-server/lib/resource_management</resource_management.install.dir>
- <jinja.install.dir>/usr/lib/ambari-server/lib/ambari_jinja2</jinja.install.dir>
- <simplejson.install.dir>/usr/lib/ambari-server/lib/ambari_simplejson</simplejson.install.dir>
- <ambari-web-dir>${basedir}/../ambari-web/public</ambari-web-dir>
- <ambari-admin-dir>${basedir}/../ambari-admin</ambari-admin-dir>
- <contrib-views-dir>${basedir}/../contrib/views</contrib-views-dir>
- <resourceManagementSrcLocation>${project.basedir}/../ambari-common/src/main/python/resource_management</resourceManagementSrcLocation>
- <customStackMap>${basedir}/../ambari-web/app/data/custom_stack_map.js</customStackMap>
- <commonServicesSrcLocation>target/classes/common-services</commonServicesSrcLocation>
- <stacksSrcLocation>target/classes/stacks/${stack.distribution}</stacksSrcLocation>
- <tarballResourcesFolder>src/main/resources</tarballResourcesFolder>
- <skipPythonTests>false</skipPythonTests>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <id>parse-version</id>
- <phase>validate</phase>
- <goals>
- <goal>parse-version</goal>
- </goals>
- </execution>
- <execution>
- <id>regex-property</id>
- <goals>
- <goal>regex-property</goal>
- </goals>
- <configuration>
- <name>ambariVersion</name>
- <value>${project.version}</value>
- <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
- <replacement>$1.$2.$3</replacement>
- <failIfNoMatch>false</failIfNoMatch>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/../</directory>
- <includes>
- <include>version</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>${basedir}/sbin/</directory>
- <includes>
- <include>ambari-server</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
- <tasks>
- <jar destfile="target/DBConnectionVerification.jar">
- <fileset dir="${basedir}/target/classes/"
- includes="**/DBConnectionVerification.class" />
- <manifest>
- <attribute name="Main-Class"
- value="org.apache.ambari.server.DBConnectionVerification" />
- </manifest>
- </jar>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>${assemblydescriptor}</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <id>build-tarball</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>pass.txt</exclude>
- <exclude>derby.log</exclude>
- <exclude>src/test/resources/version</exclude>
- <exclude>src/test/resources/users.ldif</exclude>
- <exclude>src/test/resources/gsInstaller-hosts.txt</exclude>
- <exclude>src/test/resources/temporal_ganglia_data.txt</exclude>
- <exclude>src/test/resources/users.ldif</exclude>
- <exclude>src/main/resources/hive-schema-0.10.0.oracle.sql</exclude>
- <exclude>src/main/resources/hive-schema-0.12.0.oracle.sql</exclude>
- <exclude>src/main/resources/db/serial</exclude>
- <exclude>src/main/resources/db/index.txt</exclude>
- <exclude>src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/package/templates/exclude_hosts_list.j2</exclude>
- <exclude>src/main/windows/ambari-server.cmd</exclude>
- <exclude>src/main/windows/ambari-server.ps1</exclude>
- <exclude>src/main/package/choco/ambari-server.nuspec</exclude>
- <exclude>src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/smoketest_metrics.json.j2</exclude>
- <exclude>src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/balancer-emulator/balancer-err.log</exclude>
- <exclude>src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/balancer-emulator/balancer.log</exclude>
- <exclude>src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/balancer-emulator/balancer.log</exclude>
- <exclude>src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/balancer-emulator/balancer-err.log</exclude>
- <exclude>src/main/resources/stacks/PHD/3.0.0.0/services/HDFS/package/scripts/balancer-emulator/balancer.log</exclude>
- <exclude>src/main/resources/stacks/PHD/3.0.0.0/services/HDFS/package/scripts/balancer-emulator/balancer-err.log</exclude>
- <exclude>conf/unix/ca.config</exclude>
- <exclude>conf/unix/krb5JAASLogin.conf</exclude>
- <exclude>conf/windows/ca.config</exclude>
- <exclude>conf/windows/krb5JAASLogin.conf</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/*.json</exclude>
- <exclude>**/*.sql</exclude>
- <exclude>**/repo_suse_rhel.j2</exclude>
- <exclude>**/repo_debian.j2</exclude>
- <exclude>**/cluster.properties.j2</exclude>
- <exclude>**/repo_ubuntu.j2</exclude>
- <exclude>**/.pydev*</exclude>
- <!--gitignore content -->
- <exclude>src/main/resources/db/newcerts/**</exclude>
-
- <!-- Stack definitions -->
- <exclude>src/main/resources/stacks/HDP/2.0._/services/HBASE/package/templates/regionservers.j2</exclude>
- <exclude>src/main/resources/stacks/HDPWIN/2.1/services/*/configuration*/*</exclude>
-
- <!--test samples -->
- <exclude>src/test/resources/TestAmbaryServer.samples/**</exclude>
- <exclude>src/test/resources/*.txt</exclude>
- <exclude>src/test/resources/users_for_dn_with_space.ldif</exclude>
-
- <!--Velocity log -->
- <exclude>**/velocity.log*</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>eclipselink-staticweave-maven-plugin</artifactId>
- <groupId>au.com.alderaan</groupId>
- <version>1.0.4</version>
- <executions>
- <execution>
- <goals>
- <goal>weave</goal>
- </goals>
- <phase>process-classes</phase>
- <configuration>
- <logLevel>ALL</logLevel>
- <includeProjectClasspath>true</includeProjectClasspath>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>eclipselink</artifactId>
- <version>2.4.2</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rpm-maven-plugin</artifactId>
- <version>2.0.1</version>
- <executions>
- <execution>
- <!-- unbinds rpm creation from maven lifecycle -->
- <phase>none</phase>
- <goals>
- <goal>rpm</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <copyright>2012, Apache Software Foundation</copyright>
- <group>Development</group>
- <description>Maven Recipe: RPM Package.</description>
- <autoRequires>no</autoRequires>
- <requires>
- <require>postgresql-server >= 8.1</require>
- <require>openssl</require>
- <require>${python.ver}</require>
- <require>${python.xml.package}</require>
- </requires>
- <postinstallScriptlet>
- <scriptFile>src/main/package/rpm/postinstall.sh</scriptFile>
- <fileEncoding>utf-8</fileEncoding>
- </postinstallScriptlet>
- <preinstallScriptlet>
- <scriptFile>src/main/package/rpm/preinstall.sh</scriptFile>
- <fileEncoding>utf-8</fileEncoding>
- </preinstallScriptlet>
- <preremoveScriptlet>
- <scriptFile>src/main/package/rpm/preremove.sh</scriptFile>
- <fileEncoding>utf-8</fileEncoding>
- </preremoveScriptlet>
- <posttransScriptlet>
- <scriptFile>src/main/package/rpm/posttrans_server.sh</scriptFile>
- <fileEncoding>utf-8</fileEncoding>
- </posttransScriptlet>
- <defaultFilemode>644</defaultFilemode>
- <defaultDirmode>755</defaultDirmode>
- <defaultUsername>root</defaultUsername>
- <defaultGroupname>root</defaultGroupname>
- <needarch>x86_64</needarch>
- <mappings>
- <mapping>
- <directory>/usr/lib/ambari-server</directory>
- <dependency>
- </dependency>
- </mapping>
- <mapping>
- <directory>/usr/lib/ambari-server/app/data</directory>
- <sources>
- <source>
- <location>${customStackMap}</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/usr/lib/ambari-server/web</directory>
- <sources>
- <source>
- <location>${ambari-web-dir}</location>
- <includes>
- <include>**</include>
- </includes>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/usr/lib/ambari-server</directory>
- <sources>
- <source>
- <location>${project.build.directory}/${project.artifactId}-${project.version}.jar</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>${ambari_commons.install.dir}</directory>
- <sources>
- <source>
- <location>
- ${project.basedir}/../ambari-common/src/main/python/ambari_commons
- </location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>${resource_management.install.dir}</directory>
- <sources>
- <source>
- <location>
- ${resourceManagementSrcLocation}
- </location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>${jinja.install.dir}</directory>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>${project.basedir}/../ambari-common/src/main/python/ambari_jinja2/ambari_jinja2</location>
- <excludes>
- <exclude>${project.basedir}/../ambari-common/src/main/python/ambari_jinja2/ambari_jinja2/testsuite</exclude>
- </excludes>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>${simplejson.install.dir}</directory>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>${project.basedir}/../ambari-common/src/main/python/ambari_simplejson</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/usr/sbin</directory>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <directoryIncluded>false</directoryIncluded>
- <sources>
- <source>
- <location>src/main/python/ambari-server.py</location>
- </source>
- <source>
- <location>src/main/python/ambari_server_main.py</location>
- </source>
- <source>
- <location>sbin/ambari-server</location>
- <filter>true</filter>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/</directory>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <directoryIncluded>false</directoryIncluded>
- <sources>
- <source>
- <location>../ambari-common/src/main/unix/ambari-python-wrap</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/etc/ambari-server/conf</directory>
- <configuration>true</configuration>
- <sources>
- <source>
- <location>conf/unix/ambari.properties</location>
- </source>
- <source>
- <location>conf/unix/log4j.properties</location>
- </source>
- <source>
- <location>conf/unix/krb5JAASLogin.conf</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/</directory>
- <configuration>true</configuration>
- <filemode>700</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>conf/unix/ambari-env.sh</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/</directory>
- <filemode>700</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>conf/unix/ambari-sudo.sh</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/</directory>
- <filemode>700</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>conf/unix/install-helper.sh</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/keys</directory>
- <sources>
- <source>
- <location>conf/unix/ca.config</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/keys/db</directory>
- <filemode>700</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>src/main/resources/db</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/run/ambari-server/bootstrap</directory>
- </mapping>
- <mapping>
- <directory>/var/run/ambari-server/stack-recommendations</directory>
- </mapping>
- <mapping>
- <directory>/var/log/ambari-server</directory>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/resources</directory>
- <sources>
- <source>
- <location>target/classes/Ambari-DDL-Postgres-CREATE.sql</location>
- </source>
- <source>
- <location>src/main/resources/Ambari-DDL-Postgres-DROP.sql</location>
- </source>
- <source>
- <location>target/classes/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql</location>
- </source>
- <source>
- <location>src/main/resources/Ambari-DDL-Postgres-EMBEDDED-DROP.sql</location>
- </source>
- <source>
- <location>target/classes/Ambari-DDL-Oracle-CREATE.sql</location>
- </source>
- <source>
- <location>target/classes/Ambari-DDL-MySQL-CREATE.sql</location>
- </source>
- <source>
- <location>src/main/resources/Ambari-DDL-Oracle-DROP.sql</location>
- </source>
- <source>
- <location>src/main/resources/Ambari-DDL-MySQL-DROP.sql</location>
- </source>
- <source>
- <location>target/classes/Ambari-DDL-SQLServer-CREATE.sql</location>
- </source>
- <source>
- <location>target/classes/Ambari-DDL-SQLServer-CREATELOCAL.sql</location>
- </source>
- <source>
- <location>src/main/resources/Ambari-DDL-SQLServer-DROP.sql</location>
- </source>
- <source>
- <location>${project.build.directory}/DBConnectionVerification.jar</location>
- </source>
- <source>
- <location>src/main/resources/role_command_order.json</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/data/tmp</directory>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/data/cache</directory>
- <filemode>700</filemode>
- <username>root</username>
- <groupname>root</groupname>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/resources/apps</directory>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>src/main/resources/slider_resources/README.txt</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/resources/scripts</directory>
- <filemode>755</filemode>
- <sources>
- <source>
- <location>src/main/resources/scripts</location>
- </source>
- <source>
- <location>src/main/python/upgradeHelper.py</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/resources/views</directory>
- <filemode>755</filemode>
- <sources>
- <source>
- <location>${ambari-admin-dir}/target</location>
- <includes>
- <include>*.jar</include>
- </includes>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/resources/upgrade</directory>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/resources/upgrade/ddl</directory>
- <sources>
- <source>
- <location>src/main/resources/upgrade/ddl</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/resources/upgrade/dml</directory>
- <sources>
- <source>
- <location>src/main/resources/upgrade/dml</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/resources/common-services</directory>
- <sources>
- <source>
- <location>${commonServicesSrcLocation}</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/resources/upgrade/catalog</directory>
- <sources>
- <source>
- <location>src/main/resources/upgrade/catalog</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/resources/stacks/${stack.distribution}</directory>
- <sources>
- <source>
- <location>${stacksSrcLocation}</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/resources/stacks</directory>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>target/classes/stacks/stack_advisor.py</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/usr/lib/python2.6/site-packages/ambari_server</directory>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>src/main/python/ambari_server</location>
- </source>
- <source>
- <location>src/main/python/bootstrap.py</location>
- </source>
- <source>
- <location>src/main/python/setupAgent.py</location>
- </source>
- <source>
- <location>src/main/python/os_check_type.py</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/run/ambari-server</directory>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/resources</directory>
- <sources>
- <source>
- <location>../version</location>
- <filter>true</filter>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/resources/custom_action_definitions</directory>
- <sources>
- <source>
- <location>src/main/resources/custom_action_definitions</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <!-- custom actions root-->
- <directory>/var/lib/ambari-server/resources/custom_actions</directory>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>src/main/resources/custom_actions</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-server/resources/host_scripts</directory>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>src/main/resources/host_scripts</location>
- </source>
- </sources>
- </mapping>
- </mappings>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.vafer</groupId>
- <artifactId>jdeb</artifactId>
- <version>1.0.1</version>
- <executions>
- <execution>
- <!-- unbinds rpm creation from maven lifecycle -->
- <phase>none</phase>
- <goals>
- <goal>jdeb</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <controlDir>${basedir}/src/main/package/deb/control</controlDir>
- <deb>${basedir}/target/${artifactId}_${package-version}-${package-release}.deb</deb>
- <dataSet>
- <data>
- <type>template</type>
- <paths>
- <path>/usr/lib/ambari-server</path>
- <path>/var/run/ambari-server</path>
- <path>/var/run/ambari-server/bootstrap</path>
- <path>/var/run/ambari-server/stack-recommendations</path>
- <path>/var/log/ambari-server</path>
- <path>/var/lib/ambari-server/resources/upgrade</path>
- <path>/var/lib/ambari-server/data/tmp</path>
- <path>/var/lib/ambari-server/data/cache</path>
- </paths>
- </data>
- <!-- TODO: should be included all subdirs, if exists-->
- <data>
- <src>${basedir}/../ambari-web/public</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>/usr/lib/ambari-server/web</prefix>
- </mapper>
- </data>
- <data>
- <src>${project.build.directory}/${project.artifactId}-${project.version}-dist/${project.artifactId}-${project.version}/lib</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>/usr/lib</prefix>
- </mapper>
- </data>
- <data>
- <src>src/main/python/ambari-server.py</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/usr/sbin</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>src/main/python/ambari_server_main.py</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/usr/sbin</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>src/main/python/ambari-server.py</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/usr/sbin</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>../ambari-common/src/main/unix/ambari-python-wrap</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>${basedir}/target/ambari-server</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/usr/sbin</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>conf/unix/ambari.properties</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/etc/ambari-server/conf</prefix>
- </mapper>
- </data>
- <data>
- <src>conf/unix/log4j.properties</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/etc/ambari-server/conf</prefix>
- </mapper>
- </data>
- <data>
- <src>conf/unix/krb5JAASLogin.conf</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/etc/ambari-server/conf</prefix>
- </mapper>
- </data>
- <!-- /q001 -->
- <data>
- <src>conf/unix/ambari-env.sh</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>700</filemode>
- </mapper>
- </data>
- <data>
- <src>conf/unix/ambari-sudo.sh</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>700</filemode>
- </mapper>
- </data>
- <data>
- <src>conf/unix/install-helper.sh</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>700</filemode>
- </mapper>
- </data>
- <data>
- <src>src/main/resources/slider_resources/README.txt</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources/apps/</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>conf/unix/ca.config</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/keys</prefix>
- </mapper>
- </data>
- <data>
- <src>src/main/resources/db</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/keys/db</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>700</filemode>
- </mapper>
- </data>
- <data>
- <src>target/classes/Ambari-DDL-Postgres-CREATE.sql</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources</prefix>
- </mapper>
- </data>
- <data>
- <src>src/main/resources/Ambari-DDL-Postgres-DROP.sql</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources</prefix>
- </mapper>
- </data>
- <data>
- <src>target/classes/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources</prefix>
- </mapper>
- </data>
- <data>
- <src>src/main/resources/Ambari-DDL-Postgres-EMBEDDED-DROP.sql</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources</prefix>
- </mapper>
- </data>
- <data>
- <src>target/classes/Ambari-DDL-Oracle-CREATE.sql</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources</prefix>
- </mapper>
- </data>
- <data>
- <src>target/classes/Ambari-DDL-MySQL-CREATE.sql</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources</prefix>
- </mapper>
- </data>
- <data>
- <src>src/main/resources/Ambari-DDL-Oracle-DROP.sql</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources</prefix>
- </mapper>
- </data>
- <data>
- <src>src/main/resources/Ambari-DDL-MySQL-DROP.sql</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources</prefix>
- </mapper>
- </data>
- <data>
- <src>target/classes/Ambari-DDL-SQLServer-CREATE.sql</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources</prefix>
- </mapper>
- </data>
- <data>
- <src>target/classes/Ambari-DDL-SQLServer-CREATELOCAL.sql</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources</prefix>
- </mapper>
- </data>
- <data>
- <src>src/main/resources/Ambari-DDL-SQLServer-DROP.sql</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources</prefix>
- </mapper>
- </data>
- <data>
- <src>${project.build.directory}/DBConnectionVerification.jar</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources</prefix>
- </mapper>
- </data>
- <data>
- <src>src/main/resources/role_command_order.json</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources</prefix>
- </mapper>
- </data>
- <data>
- <src>src/main/resources/scripts</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources/scripts</prefix>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>${ambari-admin-dir}/target</src>
- <type>directory</type>
- <includes>*.jar</includes>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources/views</prefix>
- </mapper>
- </data>
- <data>
- <src>src/main/python/upgradeHelper.py</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources/scripts</prefix>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>src/main/resources/upgrade/ddl</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources/upgrade/ddl</prefix>
- </mapper>
- </data>
- <data>
- <src>src/main/resources/upgrade/dml</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources/upgrade/dml</prefix>
- </mapper>
- </data>
- <data>
- <src>${commonServicesSrcLocation}</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources/common-services</prefix>
- </mapper>
- </data>
- <data>
- <src>src/main/resources/upgrade/catalog</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources/upgrade/catalog</prefix>
- </mapper>
- </data>
- <data>
- <src>${stacksSrcLocation}</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources/stacks/${stack.distribution}</prefix>
- </mapper>
- </data>
- <data>
- <src>target/classes/stacks/stack_advisor.py</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources/stacks</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>src/main/python/ambari_server</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>/usr/lib/python2.6/site-packages/ambari_server</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>src/main/python/bootstrap.py</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/usr/lib/python2.6/site-packages/ambari_server</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>src/main/python/setupAgent.py</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/usr/lib/python2.6/site-packages/ambari_server</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>${customStackMap}</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/usr/lib/ambari-server/app/data</prefix>
- </mapper>
- </data>
- <data>
- <src>src/main/python/os_check_type.py</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/usr/lib/python2.6/site-packages/ambari_server</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>${basedir}/target/version</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources</prefix>
- </mapper>
- </data>
- <data>
- <src>src/main/resources/custom_action_definitions</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources/custom_action_definitions</prefix>
- </mapper>
- </data>
- <data>
- <src>src/main/resources/custom_actions</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources/custom_actions</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>src/main/resources/host_scripts</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-server/resources/host_scripts</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>
- ${project.basedir}/../ambari-common/src/main/python/ambari_commons
- </src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>${ambari_commons.install.dir}</prefix>
- <filemode>755</filemode>
- <user>root</user>
- <group>root</group>
- </mapper>
- </data>
- <data>
- <src>
- ${resourceManagementSrcLocation}
- </src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>${resource_management.install.dir}</prefix>
- <filemode>755</filemode>
- <user>root</user>
- <group>root</group>
- </mapper>
- </data>
- <data>
- <src>${project.basedir}/../ambari-common/src/main/python/ambari_jinja2/ambari_jinja2</src>
- <excludes>${project.basedir}/../ambari-common/src/main/python/ambari_jinja2/ambari_jinja2/testsuite</excludes>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>${jinja.install.dir}</prefix>
- <filemode>755</filemode>
- <user>root</user>
- <group>root</group>
- </mapper>
- </data>
- <data>
- <src>${project.basedir}/../ambari-common/src/main/python/ambari_simplejson</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>${simplejson.install.dir}</prefix>
- <filemode>755</filemode>
- <user>root</user>
- <group>root</group>
- </mapper>
- </data>
- </dataSet>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.2</version>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>${skipSurefireTests}</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <configuration>
- <executable>${executable.python}</executable>
- <workingDirectory>src/test/python</workingDirectory>
- <arguments>
- <argument>unitTests.py</argument>
- <argument>${custom.tests}</argument>
- </arguments>
- <environmentVariables>
- <PYTHONPATH>${path.python.1}${pathsep}$PYTHONPATH</PYTHONPATH>
- </environmentVariables>
- <skip>${skipPythonTests}</skip>
- </configuration>
- <id>python-test</id>
- <phase>test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <version>3.1.11</version>
- <!-- <configuration> <licenseLocation>/path/to/clover.license</licenseLocation>
- </configuration> -->
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>${buildnumber-maven-plugin-version}</version>
- <configuration>
- <urlScm>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-ambari.git</urlScm>
- </configuration>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
- <tasks>
- <jar destfile="target/DBConnectionVerification.jar">
- <fileset dir="${basedir}/target/classes/"
- includes="**/DBConnectionVerification.class" />
- <manifest>
- <attribute name="Main-Class"
- value="org.apache.ambari.server.DBConnectionVerification" />
- </manifest>
- </jar>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <!-- Copies compiled views into known location for RPM builds -->
- <execution>
- <id>copy-view-jars</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <copy todir="${ambari-admin-dir}/target" flatten="true">
- <fileset dir="${contrib-views-dir}">
- <include name="*/target/*jar" />
- <exclude name="**/ambari-views-utils*jar" />
- </fileset>
- </copy>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>stacks/**</exclude>
- <exclude>common-services/**</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- <includes>
- <include>stacks/**</include>
- <include>common-services/**</include>
- </includes>
- </resource>
- </resources>
- </build>
- <profiles>
- <profile>
- <id>replaceurl</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>set-hdp-url-classes</id>
- <phase>process-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target name="ambari-server-compile">
- <exec dir="${basedir}" executable="bash"
- failonerror="true">
- <arg value="${basedir}/set-hdp-repo-url.sh" />
- <arg value="${hdpUrlForCentos6}" />
- <arg value="${hdpLatestUrl}" />
- </exec>
- </target>
- </configuration>
- </execution>
- <execution>
- <id>set-hdp-url-packages</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target name="ambari-server-compile">
- <exec dir="${basedir}" executable="bash"
- failonerror="true">
- <arg value="${basedir}/set-hdp-repo-url.sh" />
- <arg value="${hdpUrlForCentos6}" />
- <arg value="${hdpLatestUrl}" />
- <arg
- value="${project.build.directory}/ambari-server-${project.version}-dist/ambari-server-${project.version}" />
- </exec>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>skipTestRun</id>
- <activation>
- <property>
- <name>skipTests</name>
- </property>
- </activation>
- <properties>
- <skipPythonTests>true</skipPythonTests>
- </properties>
- </profile>
- <profile>
- <id>windows</id>
- <activation>
- <os>
- <family>win</family>
- </os>
- </activation>
- <properties>
- <envClassifier>win</envClassifier>
- <dirsep>\</dirsep>
- <pathsep>;</pathsep>
- <executable.python>python</executable.python>
- <executable.shell>cmd</executable.shell>
- <fileextension.shell>cmd</fileextension.shell>
- <fileextension.dot.shell-default>.cmd</fileextension.dot.shell-default>
- <path.python.1>${project.basedir}\..\ambari-common\src\main\python;${project.basedir}\..\ambari-agent\src\main\python;${project.basedir}\..\ambari-common\src\main\python\ambari_jinja2;${project.basedir}\..\ambari-common\src\main\python\ambari_commons;${project.basedir}\..\ambari-common\src\test\python;${project.basedir}\src\main\python;${project.basedir}\src\main\python\ambari-server-state;${project.basedir}\src\main\resources\custom_actions\scripts;${project.basedir}\src\main\resources\scripts;${project.basedir}\src\test\python</path.python.1>
- <assemblydescriptor>src/main/assemblies/server-windows.xml</assemblydescriptor>
- <assemblybootstrap>src/main/assemblies/bootstrap-windows.xml</assemblybootstrap>
- <assemblychocodescriptor>src/main/assemblies/server-windows-choco.xml</assemblychocodescriptor>
- <packagingFormat>jar</packagingFormat>
- </properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>../ambari-project/src/main/assemblies/empty.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>bootstrap-zip</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <attach>false</attach>
- <finalName>bootstrap</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <tarLongFileMode>gnu</tarLongFileMode>
- <descriptors>
- <descriptor>${assemblybootstrap}</descriptor>
- </descriptors>
- </configuration>
- </execution>
- <execution>
- <id>build-tarball</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <attach>false</attach>
- <appendAssemblyId>true</appendAssemblyId>
- <tarLongFileMode>gnu</tarLongFileMode>
- <descriptors>
- <descriptor>${assemblydescriptor}</descriptor>
- </descriptors>
- </configuration>
- </execution>
- <execution>
- <id>build-choco-dir</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <attach>false</attach>
- <appendAssemblyId>true</appendAssemblyId>
- <tarLongFileMode>gnu</tarLongFileMode>
- <descriptors>
- <descriptor>${assemblychocodescriptor}</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>build-choco-package</id>
- <phase>package</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>choco.exe</executable>
- <arguments>
- <argument>pack</argument>
- <argument>--version=${project.version}</argument>
- <argument>${basedir}/target/ambari-server-${project.version}-choco/ambari-server.nuspec</argument>
- </arguments>
- <workingDirectory>target/ambari-server-${project.version}-choco</workingDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>linux</id>
- <activation>
- <os>
- <family>unix</family>
- </os>
- </activation>
- <properties>
- <envClassifier>linux</envClassifier>
- <dirsep>/</dirsep>
- <pathsep>:</pathsep>
- <executable.python>${project.basedir}/../ambari-common/src/main/unix/ambari-python-wrap</executable.python>
- <executable.shell>sh</executable.shell>
- <fileextension.shell>sh</fileextension.shell>
- <fileextension.dot.shell-default></fileextension.dot.shell-default>
- <path.python.1>${project.basedir}/../ambari-common/src/main/python:${project.basedir}/../ambari-agent/src/main/python:${project.basedir}/../ambari-common/src/main/python/ambari_jinja2:${project.basedir}/../ambari-common/src/main/python/ambari_commons:${project.basedir}/../ambari-common/src/test/python:${project.basedir}/src/main/python:${project.basedir}/src/main/python/ambari-server-state:${project.basedir}/src/main/resources/custom_actions:${project.basedir}/src/main/resources/scripts:${project.basedir}/src/test/python</path.python.1>
- <assemblydescriptor>src/main/assemblies/server.xml</assemblydescriptor>
- <packagingFormat>jar</packagingFormat>
- </properties>
- </profile>
- <profile>
- <id>suse11</id>
- <properties>
- <python.xml.package>python-xml</python.xml.package>
- </properties>
- </profile>
- <profile>
- <id>pluggable-stack-definition</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property>
- <name>pluggableStackDefinitionConfig</name>
- </property>
- </activation>
- <properties>
- <customStackMap>target/pluggable-stack-definition/custom_stack_map.js</customStackMap>
- <resourceManagementSrcLocation>target/pluggable-stack-definition/python/resource_management</resourceManagementSrcLocation>
- <commonServicesSrcLocation>target/pluggable-stack-definition/common-services</commonServicesSrcLocation>
- <stacksSrcLocation>target/pluggable-stack-definition/stacks/${stack.distribution}</stacksSrcLocation>
- <resourcesSrcLocation>src/main/resources</resourcesSrcLocation>
- <tarballResourcesFolder>target/pluggable-stack-definition</tarballResourcesFolder>
- <pluggableStackDefinitionScriptLocation>${project.basedir}/../ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py</pluggableStackDefinitionScriptLocation>
- <pluggableStackDefinitionConfig>${project.basedir}/../ambari-common/src/main/python/pluggable_stack_definition/configs/${stack.distribution}.json</pluggableStackDefinitionConfig>
- <pluggableStackDefinitionOutput>target/pluggable-stack-definition</pluggableStackDefinitionOutput>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <configuration>
- <executable>${executable.python}</executable>
- <arguments>
- <argument>${pluggableStackDefinitionScriptLocation}</argument>
- <argument>-c</argument>
- <argument>${pluggableStackDefinitionConfig}</argument>
- <argument>-r</argument>
- <argument>${resourcesSrcLocation}</argument>
- <argument>-o</argument>
- <argument>${pluggableStackDefinitionOutput}</argument>
- </arguments>
- </configuration>
- <id>pluggable-stack-definition-generate</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>ambari-views</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-csv</artifactId>
- </dependency>
- <dependency>
- <groupId>uk.com.robust-it</groupId>
- <artifactId>cloning</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-assistedinject</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-persist</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-servlet</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-multibindings</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>10.11.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-ldap</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.ldap</groupId>
- <artifactId>spring-ldap-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-server-annotations</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core-integ</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-server-integ</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-jdbm</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-kerberos-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-protocol-ldap</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>kerberos-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>eclipselink</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlets</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- </dependency>
- <!--jsp support for jetty -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-api-2.1-glassfish</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1-glassfish</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-multipart</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-guice</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-grizzly2</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-reflect</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis-tck</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>3.3.1</version>
- </dependency>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>9.3-1101-jdbc4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.2.5</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>14.0.1</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>1.3.9</version>
- </dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz-jobs</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>mailapi</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>smtp</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.snmp4j</groupId>
- <artifactId>snmp4j</artifactId>
- <version>1.10.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ambari</groupId>
- <artifactId>ambari-metrics-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>2.1.4</version>
- </dependency>
- </dependencies>
-
- <pluginRepositories>
- <pluginRepository>
- <id>oss.sonatype.org</id>
- <name>OSS Sonatype Staging</name>
- <url>https://oss.sonatype.org/content/groups/staging</url>
- </pluginRepository>
- </pluginRepositories>
-
-</project>
http://git-wip-us.apache.org/repos/asf/ambari/blob/e60dbb4e/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 808cca4..0b0ee95 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -427,6 +427,8 @@ public class Configuration {
private static final String DEFAULT_TIMELINE_METRICS_REQUEST_CONNECT_TIMEOUT = "5000";
private static final String TIMELINE_METRICS_REQUEST_CATCHUP_INTERVAL = "server.timeline.metrics.cache.catchup.interval";
private static final String DEFAULT_TIMELINE_METRICS_REQUEST_CATCHUP_INTERVAL = "300000";
+ private static final String TIMELINE_METRICS_CACHE_HEAP_PERCENT = "server.timeline.metrics.cache.heap.percent";
+ private static final String DEFAULT_TIMELINE_METRICS_CACHE_HEAP_PERCENT = "15%";
/**
* The full path to the XML file that describes the different alert templates.
@@ -1552,7 +1554,7 @@ public class Configuration {
public int getHttpSessionInactiveTimeout() {
return Integer.parseInt(properties.getProperty(
SERVER_HTTP_SESSION_INACTIVE_TIMEOUT,
- "1800"));
+ "1800"));
}
/**
@@ -1822,7 +1824,9 @@ public class Configuration {
/**
* Max allowed entries in metrics cache.
+ * @deprecated Ehcache only supports either a max heap bytes or entries.
*/
+ @Deprecated
public int getMetricCacheMaxEntries() {
return Integer.parseInt(properties.getProperty(TIMELINE_METRICS_CACHE_MAX_ENTRIES,
DEFAULT_TIMELINE_METRICS_CACHE_MAX_ENTRIES));
@@ -1887,6 +1891,18 @@ public class Configuration {
*/
public Long getMetricRequestBufferTimeCatchupInterval() {
return Long.parseLong(properties.getProperty(TIMELINE_METRICS_REQUEST_CATCHUP_INTERVAL,
- DEFAULT_TIMELINE_METRICS_REQUEST_CATCHUP_INTERVAL));
+ DEFAULT_TIMELINE_METRICS_REQUEST_CATCHUP_INTERVAL));
+ }
+
+ /**
+ * Percentage of total heap allocated to metrics cache, default is 15%.
+ * Default heap setting for the server is 2 GB so max allocated heap size
+ * for this cache is 300 MB.
+ */
+ public String getMetricsCacheManagerHeapPercent() {
+ String percent = properties.getProperty(TIMELINE_METRICS_CACHE_HEAP_PERCENT,
+ DEFAULT_TIMELINE_METRICS_CACHE_HEAP_PERCENT);
+
+ return percent.trim().endsWith("%") ? percent.trim() : percent.trim() + "%";
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e60dbb4e/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java
index 0605123..85ea575 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java
@@ -42,7 +42,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
import java.util.concurrent.atomic.AtomicInteger;
import static org.apache.ambari.server.controller.metrics.MetricsPaddingMethod.ZERO_PADDING_PARAM;
http://git-wip-us.apache.org/repos/asf/ambari/blob/e60dbb4e/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCache.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCache.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCache.java
index 47b2c4a..9e343e3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCache.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCache.java
@@ -23,6 +23,7 @@ import net.sf.ehcache.Element;
import net.sf.ehcache.constructs.blocking.LockTimeoutException;
import net.sf.ehcache.constructs.blocking.UpdatingCacheEntryFactory;
import net.sf.ehcache.constructs.blocking.UpdatingSelfPopulatingCache;
+import net.sf.ehcache.statistics.StatisticsGateway;
import org.apache.ambari.server.AmbariException;
import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics;
@@ -74,7 +75,15 @@ public class TimelineMetricCache extends UpdatingSelfPopulatingCache {
if (LOG.isDebugEnabled()) {
// Print stats every 100 calls - Note: Supported in debug mode only
if (printCacheStatsCounter.getAndIncrement() == 0) {
- LOG.debug("Metrics cache stats => \n" + this.getStatistics());
+ StatisticsGateway statistics = this.getStatistics();
+ LOG.debug("Metrics cache stats => \n" +
+ ", Evictions = " + statistics.cacheEvictedCount() +
+ ", Expired = " + statistics.cacheExpiredCount() +
+ ", Hits = " + statistics.cacheHitCount() +
+ ", Misses = " + statistics.cacheMissCount() +
+ ", Hit ratio = " + statistics.cacheHitRatio() +
+ ", Puts = " + statistics.cachePutCount() +
+ ", Size in MB = " + (statistics.getLocalHeapSizeInBytes() / 1048576));
} else {
printCacheStatsCounter.compareAndSet(100, 0);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e60dbb4e/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheEntryFactory.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheEntryFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheEntryFactory.java
index 597f037..b7b081d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheEntryFactory.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheEntryFactory.java
@@ -81,8 +81,12 @@ public class TimelineMetricCacheEntryFactory implements UpdatingCacheEntryFactor
LOG.debug("Creating cache entry since none exists, key = " + key);
TimelineAppMetricCacheKey metricCacheKey = (TimelineAppMetricCacheKey) key;
- TimelineMetrics timelineMetrics =
- requestHelperForGets.fetchTimelineMetrics(metricCacheKey.getSpec());
+ TimelineMetrics timelineMetrics = null;
+ try {
+ timelineMetrics = requestHelperForGets.fetchTimelineMetrics(metricCacheKey.getSpec());
+ } catch (IOException io) {
+ LOG.debug("Caught IOException on fetching metrics. " + io.getMessage());
+ }
TimelineMetricsCacheValue value = null;