Repository: ambari Updated Branches: refs/heads/branch-2.5 777d97afb -> a6d858add
AMBARI-17596 : Collect & Publish AmbariServer database metrics. (Fix import order) (avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a6d858ad Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a6d858ad Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a6d858ad Branch: refs/heads/branch-2.5 Commit: a6d858add4d6aea657f1494a9b6118c3f2fcb4c2 Parents: 777d97a Author: Aravindan Vijayan <[email protected]> Authored: Mon Jan 9 15:21:11 2017 -0800 Committer: Aravindan Vijayan <[email protected]> Committed: Mon Jan 9 15:21:11 2017 -0800 ---------------------------------------------------------------------- .../system/impl/AmbariPerformanceMonitor.java | 15 ++++++++------- .../metrics/system/impl/DatabaseMetricsSource.java | 5 ++--- .../server/metric/system/impl/MetricsSourceTest.java | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a6d858ad/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariPerformanceMonitor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariPerformanceMonitor.java b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariPerformanceMonitor.java index 236d8ff..52cc0a3 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariPerformanceMonitor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariPerformanceMonitor.java @@ -18,13 +18,6 @@ package org.apache.ambari.server.metrics.system.impl; -import com.google.inject.Singleton; -import org.apache.commons.lang.StringUtils; -import org.eclipse.persistence.sessions.SessionProfiler; -import org.eclipse.persistence.tools.profiler.PerformanceMonitor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -32,6 +25,14 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; +import org.apache.commons.lang.StringUtils; +import org.eclipse.persistence.sessions.SessionProfiler; +import org.eclipse.persistence.tools.profiler.PerformanceMonitor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.inject.Singleton; + /** * Class to extend the EclipseLink PerformanceMonitor, and dump the collected metrics to the AmbariServer Database Metrics source. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/a6d858ad/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/DatabaseMetricsSource.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/DatabaseMetricsSource.java b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/DatabaseMetricsSource.java index da5ad70..fa04f74 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/DatabaseMetricsSource.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/DatabaseMetricsSource.java @@ -27,19 +27,18 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.google.common.util.concurrent.ThreadFactoryBuilder; import org.apache.ambari.server.metrics.system.MetricsSink; import org.apache.ambari.server.metrics.system.SingleMetric; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.util.concurrent.ThreadFactoryBuilder; + /** * @{link DatabaseMetricsSource} collects database metrics which is generated through Eclipselink PerformanceMonitor, http://git-wip-us.apache.org/repos/asf/ambari/blob/a6d858ad/ambari-server/src/test/java/org/apache/ambari/server/metric/system/impl/MetricsSourceTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/metric/system/impl/MetricsSourceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/metric/system/impl/MetricsSourceTest.java index 067d4fb..3586b8c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/metric/system/impl/MetricsSourceTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/metric/system/impl/MetricsSourceTest.java @@ -18,6 +18,11 @@ package org.apache.ambari.server.metric.system.impl; +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + import java.util.HashMap; import java.util.List; import java.util.Map; @@ -39,11 +44,6 @@ import org.junit.Assume; import org.junit.Test; import org.junit.runner.RunWith; -import static org.easymock.EasyMock.capture; -import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; - import junit.framework.Assert; @RunWith(EasyMockRunner.class)
