You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by am...@apache.org on 2014/12/23 13:09:11 UTC
incubator-lens git commit: LENS-144 : Fix registering ganglia
reporter config (Raju Bairishetti via amareshwari)
Repository: incubator-lens
Updated Branches:
refs/heads/master 03ee90cde -> f6f675e2a
LENS-144 : Fix registering ganglia reporter config (Raju Bairishetti via amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/f6f675e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/f6f675e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/f6f675e2
Branch: refs/heads/master
Commit: f6f675e2a6ebf5281ad117690d6ab0ca71c464f3
Parents: 03ee90c
Author: Amareshwari Sriramdasu <am...@inmobi.com>
Authored: Tue Dec 23 17:39:01 2014 +0530
Committer: Amareshwari Sriramdasu <am...@inmobi.com>
Committed: Tue Dec 23 17:39:01 2014 +0530
----------------------------------------------------------------------
.../org/apache/lens/server/MetricsServiceImpl.java | 6 +++++-
.../org/apache/lens/server/TestLensApplication.java | 14 ++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f6f675e2/lens-server/src/main/java/org/apache/lens/server/MetricsServiceImpl.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/MetricsServiceImpl.java b/lens-server/src/main/java/org/apache/lens/server/MetricsServiceImpl.java
index b0774e0..83ecbb8 100644
--- a/lens-server/src/main/java/org/apache/lens/server/MetricsServiceImpl.java
+++ b/lens-server/src/main/java/org/apache/lens/server/MetricsServiceImpl.java
@@ -190,7 +190,7 @@ public class MetricsServiceImpl extends AbstractService implements MetricsServic
reporters.add(reporter);
}
- if (hiveConf.getBoolean(LensConfConstants.ENABLE_CONSOLE_METRICS, false)) {
+ if (hiveConf.getBoolean(LensConfConstants.ENABLE_GANGLIA_METRICS, false)) {
GMetric ganglia;
try {
ganglia = new GMetric(hiveConf.get(LensConfConstants.GANGLIA_SERVERNAME), hiveConf.getInt(
@@ -410,4 +410,8 @@ public class MetricsServiceImpl extends AbstractService implements MetricsServic
public long getTotalSuccessfulQueries() {
return totalSuccessfulQueries.getCount();
}
+
+ protected List<ScheduledReporter> getReporters() {
+ return reporters;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f6f675e2/lens-server/src/test/java/org/apache/lens/server/TestLensApplication.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/TestLensApplication.java b/lens-server/src/test/java/org/apache/lens/server/TestLensApplication.java
index e84a8da..fc06e71 100644
--- a/lens-server/src/test/java/org/apache/lens/server/TestLensApplication.java
+++ b/lens-server/src/test/java/org/apache/lens/server/TestLensApplication.java
@@ -18,11 +18,18 @@
*/
package org.apache.lens.server;
+import static org.testng.Assert.assertEquals;
+
+import java.util.List;
+
import org.apache.lens.server.LensApplication;
+import org.apache.lens.server.api.metrics.MetricsService;
import org.testng.Assert;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
+import com.codahale.metrics.ScheduledReporter;
+
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.Response;
@@ -68,6 +75,13 @@ public class TestLensApplication extends LensJerseyTest {
Assert.assertEquals(response.readEntity(String.class), "OK");
}
+ @Test
+ public void testMetricService() {
+ MetricsService metrics = ((MetricsService) LensServices.get().getService(MetricsService.NAME));
+ List<ScheduledReporter> reporters = ((MetricsServiceImpl) metrics).getReporters();
+
+ assertEquals(reporters.size(), 1, "mismatch in the number of reporters");
+ }
@Override
protected int getTestPort() {
return 19998;