ambari git commit: AMBARI-9970. Metrics are absent for Storm. (mpapyrkovskyy via swagle)

2015-03-06 Thread swagle 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.0 3f9ae9ef0 - 913c086a4


AMBARI-9970. Metrics are absent for Storm. (mpapyrkovskyy via swagle)


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

Branch: refs/heads/branch-2.0.0
Commit: 913c086a4626b0925e1f7d7a104b46b5579d9b29
Parents: 3f9ae9e
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Fri Mar 6 20:01:23 2015 -0800
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Fri Mar 6 20:01:23 2015 -0800

--
 .../timeline/AbstractTimelineMetricsSink.java   | 26 ++--
 .../cache/HandleConnectExceptionTest.java   |  4 ---
 .../sink/flume/FlumeTimelineMetricsSink.java| 13 --
 .../timeline/HadoopTimelineMetricsSink.java |  7 --
 .../kafka/KafkaTimelineMetricsReporter.java | 15 ---
 .../storm/StormTimelineMetricsReporter.java | 21 +---
 .../sink/storm/StormTimelineMetricsSink.java| 17 -
 .../storm/StormTimelineMetricsSinkTest.java |  1 -
 8 files changed, 14 insertions(+), 90 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/913c086a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
--
diff --git 
a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
 
b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
index 4f5c6a1..fd4cacd 100644
--- 
a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
+++ 
b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
@@ -19,10 +19,6 @@ package org.apache.hadoop.metrics2.sink.timeline;
 
 import java.io.IOException;
 import java.net.ConnectException;
-import java.net.SocketAddress;
-
-import java.io.IOException;
-import java.net.SocketAddress;
 
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.PostMethod;
@@ -63,19 +59,15 @@ public abstract class AbstractTimelineMetricsSink {
 try {
   String jsonData = mapper.writeValueAsString(metrics);
 
-  SocketAddress socketAddress = getServerSocketAddress();
+  StringRequestEntity requestEntity = new StringRequestEntity(jsonData, 
application/json, UTF-8);
 
-  if (socketAddress != null) {
-StringRequestEntity requestEntity = new StringRequestEntity(jsonData, 
application/json, UTF-8);
-
-PostMethod postMethod = new PostMethod(connectUrl);
-postMethod.setRequestEntity(requestEntity);
-int statusCode = httpClient.executeMethod(postMethod);
-if (statusCode != 200) {
-  LOG.info(Unable to POST metrics to collector,  + connectUrl);
-} else {
-  LOG.debug(Metrics posted to Collector  + connectUrl);
-}
+  PostMethod postMethod = new PostMethod(connectUrl);
+  postMethod.setRequestEntity(requestEntity);
+  int statusCode = httpClient.executeMethod(postMethod);
+  if (statusCode != 200) {
+LOG.info(Unable to POST metrics to collector,  + connectUrl);
+  } else {
+LOG.debug(Metrics posted to Collector  + connectUrl);
   }
 } catch (ConnectException e) {
   throw new UnableToConnectException(e).setConnectUrl(connectUrl);
@@ -86,7 +78,5 @@ public abstract class AbstractTimelineMetricsSink {
 this.httpClient = httpClient;
   }
 
-  abstract protected SocketAddress getServerSocketAddress();
-
   abstract protected String getCollectorUri();
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/913c086a/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
--
diff --git 
a/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
 
b/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
index 450906a..2786e3c 100644
--- 
a/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
+++ 
b/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
@@ -65,10 +65,6 @@ public class

ambari git commit: AMBARI-9970. Metrics are absent for Storm. (mpapyrkovskyy via swagle)

2015-03-06 Thread swagle 
Repository: ambari
Updated Branches:
  refs/heads/trunk ef262ecf2 - 61839b3dc


AMBARI-9970. Metrics are absent for Storm. (mpapyrkovskyy via swagle)


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

Branch: refs/heads/trunk
Commit: 61839b3dcf543e2b07ac23b4ab5cbd3ef3bc6317
Parents: ef262ec
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Fri Mar 6 20:02:02 2015 -0800
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Fri Mar 6 20:02:02 2015 -0800

--
 .../timeline/AbstractTimelineMetricsSink.java   | 26 ++--
 .../cache/HandleConnectExceptionTest.java   |  4 ---
 .../sink/flume/FlumeTimelineMetricsSink.java| 13 --
 .../timeline/HadoopTimelineMetricsSink.java |  7 --
 .../kafka/KafkaTimelineMetricsReporter.java | 15 ---
 .../storm/StormTimelineMetricsReporter.java | 21 +---
 .../sink/storm/StormTimelineMetricsSink.java| 17 -
 .../storm/StormTimelineMetricsSinkTest.java |  1 -
 8 files changed, 14 insertions(+), 90 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/61839b3d/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
--
diff --git 
a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
 
b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
index 4f5c6a1..fd4cacd 100644
--- 
a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
+++ 
b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
@@ -19,10 +19,6 @@ package org.apache.hadoop.metrics2.sink.timeline;
 
 import java.io.IOException;
 import java.net.ConnectException;
-import java.net.SocketAddress;
-
-import java.io.IOException;
-import java.net.SocketAddress;
 
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.PostMethod;
@@ -63,19 +59,15 @@ public abstract class AbstractTimelineMetricsSink {
 try {
   String jsonData = mapper.writeValueAsString(metrics);
 
-  SocketAddress socketAddress = getServerSocketAddress();
+  StringRequestEntity requestEntity = new StringRequestEntity(jsonData, 
application/json, UTF-8);
 
-  if (socketAddress != null) {
-StringRequestEntity requestEntity = new StringRequestEntity(jsonData, 
application/json, UTF-8);
-
-PostMethod postMethod = new PostMethod(connectUrl);
-postMethod.setRequestEntity(requestEntity);
-int statusCode = httpClient.executeMethod(postMethod);
-if (statusCode != 200) {
-  LOG.info(Unable to POST metrics to collector,  + connectUrl);
-} else {
-  LOG.debug(Metrics posted to Collector  + connectUrl);
-}
+  PostMethod postMethod = new PostMethod(connectUrl);
+  postMethod.setRequestEntity(requestEntity);
+  int statusCode = httpClient.executeMethod(postMethod);
+  if (statusCode != 200) {
+LOG.info(Unable to POST metrics to collector,  + connectUrl);
+  } else {
+LOG.debug(Metrics posted to Collector  + connectUrl);
   }
 } catch (ConnectException e) {
   throw new UnableToConnectException(e).setConnectUrl(connectUrl);
@@ -86,7 +78,5 @@ public abstract class AbstractTimelineMetricsSink {
 this.httpClient = httpClient;
   }
 
-  abstract protected SocketAddress getServerSocketAddress();
-
   abstract protected String getCollectorUri();
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/61839b3d/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
--
diff --git 
a/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
 
b/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
index 450906a..2786e3c 100644
--- 
a/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
+++ 
b/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
@@ -65,10 +65,6 @@ public class