Repository: ambari Updated Branches: refs/heads/trunk 40319b38f -> 5cadb0636
AMBARI-19786. Nimbus failed to start due to StringUtils ClassNotFound. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5cadb063 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5cadb063 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5cadb063 Branch: refs/heads/trunk Commit: 5cadb0636d5e16df6b041735caae9d2847dd690d Parents: 40319b3 Author: Siddharth Wagle <[email protected]> Authored: Mon Jan 30 13:29:22 2017 -0800 Committer: Siddharth Wagle <[email protected]> Committed: Mon Jan 30 13:29:22 2017 -0800 ---------------------------------------------------------------------- .../storm/StormTimelineMetricsReporter.java | 25 ++++++++++---------- .../storm/StormTimelineMetricsReporter.java | 16 ++++++------- 2 files changed, 20 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5cadb063/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java b/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java index fad9705..9a55f10 100644 --- a/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java +++ b/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java @@ -18,26 +18,25 @@ package org.apache.hadoop.metrics2.sink.storm; -import backtype.storm.generated.ClusterSummary; -import backtype.storm.generated.SupervisorSummary; -import backtype.storm.generated.TopologySummary; -import backtype.storm.metric.IClusterReporter; -import backtype.storm.utils.NimbusClient; -import backtype.storm.utils.Utils; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; import org.apache.hadoop.metrics2.sink.timeline.UnableToConnectException; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import backtype.storm.generated.ClusterSummary; +import backtype.storm.generated.SupervisorSummary; +import backtype.storm.generated.TopologySummary; +import backtype.storm.metric.IClusterReporter; +import backtype.storm.utils.NimbusClient; +import backtype.storm.utils.Utils; public class StormTimelineMetricsReporter extends AbstractTimelineMetricsSink implements IClusterReporter { http://git-wip-us.apache.org/repos/asf/ambari/blob/5cadb063/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java index 923de0f..535fae0 100644 --- a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java +++ b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java @@ -18,8 +18,15 @@ package org.apache.hadoop.metrics2.sink.storm; -import org.apache.commons.lang.StringUtils; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + import org.apache.commons.lang3.ClassUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; @@ -28,13 +35,6 @@ import org.apache.hadoop.metrics2.sink.timeline.configuration.Configuration; import org.apache.storm.metric.api.DataPoint; import org.apache.storm.metric.api.IClusterMetricsConsumer; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - public class StormTimelineMetricsReporter extends AbstractTimelineMetricsSink implements IClusterMetricsConsumer {
