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 2014/12/01 20:10:32 UTC
ambari git commit: AMBARI-8499. Fix config settings and emitter code
in host monitor.
Repository: ambari
Updated Branches:
refs/heads/branch-metrics-dev ba45a3f66 -> 223465201
AMBARI-8499. Fix config settings and emitter code in host monitor.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/22346520
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/22346520
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/22346520
Branch: refs/heads/branch-metrics-dev
Commit: 223465201d607335498ff9b793534b976da4aaa4
Parents: ba45a3f
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Mon Dec 1 11:06:15 2014 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Mon Dec 1 11:06:15 2014 -0800
----------------------------------------------------------------------
.gitignore | 1 +
ambari-metrics/ambari-metrics-host-monitoring/pom.xml | 3 ++-
.../ambari-metrics-host-monitoring/src/test/python/unitTests.py | 2 +-
.../stacks/HDP/2.2/services/AMS/configuration/ams-site.xml | 4 ++--
4 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/22346520/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0430303..efa328c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ derby.log
pass.txt
ambari-agent/src/test/python/ambari_agent/dummy_files/current-stack
velocity.log*
+ambari-metrics/ambari-metrics-host-monitoring/src/main/python/psutil/build
http://git-wip-us.apache.org/repos/asf/ambari/blob/22346520/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 b6e44ef..5a10c40 100644
--- a/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
+++ b/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
@@ -217,7 +217,7 @@
<exec dir="${basedir}/src/main/python/psutil" executable="python" failonerror="true">
<arg value="setup.py" />
<arg value="build" />
- <arg value="--build-base" />
+ <arg value="--build-platlib" />
<arg value="${basedir}/target/psutil_build" />
</exec>
</target>
@@ -241,6 +241,7 @@
<environmentVariables>
<PYTHONPATH>../../main/python:$PYTHONPATH</PYTHONPATH>
</environmentVariables>
+ <skip>${skipTests}</skip>
</configuration>
<id>python-test</id>
<phase>test</phase>
http://git-wip-us.apache.org/repos/asf/ambari/blob/22346520/ambari-metrics/ambari-metrics-host-monitoring/src/test/python/unitTests.py
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-host-monitoring/src/test/python/unitTests.py b/ambari-metrics/ambari-metrics-host-monitoring/src/test/python/unitTests.py
index 931b02a..73798cb 100644
--- a/ambari-metrics/ambari-metrics-host-monitoring/src/test/python/unitTests.py
+++ b/ambari-metrics/ambari-metrics-host-monitoring/src/test/python/unitTests.py
@@ -81,7 +81,7 @@ def main():
sys.path.append(project_folder + "/src/main/python/core")
sys.path.append(project_folder + "/src/main/resources/scripts")
sys.path.append(project_folder + "/src/main/resources/custom_actions")
- sys.path.append(project_folder + "/target/psutil_build/lib.linux-x86_64-2.6")
+ sys.path.append(project_folder + "/target/psutil_build")
has_failures = False
test_runs = 0
http://git-wip-us.apache.org/repos/asf/ambari/blob/22346520/ambari-server/src/main/resources/stacks/HDP/2.2/services/AMS/configuration/ams-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/AMS/configuration/ams-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/AMS/configuration/ams-site.xml
index 72ea95f..55c79ef 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/AMS/configuration/ams-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/AMS/configuration/ams-site.xml
@@ -205,9 +205,9 @@
</property>
<property>
<name>timeline.metrics.service.checkpointDelay</name>
- <value>120000</value>
+ <value>120</value>
<description>
- Time in milliseconds to sleep on the first run or when the checkpoint is
+ Time in seconds to sleep on the first run or when the checkpoint is
too old.
</description>
</property>