Repository: ambari Updated Branches: refs/heads/branch-3.0-ams 7b5679c00 -> ee8b3d9f1
Fixed compile errors from Merge trunk into branch-3.0-ams Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ee8b3d9f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ee8b3d9f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ee8b3d9f Branch: refs/heads/branch-3.0-ams Commit: ee8b3d9f17ce3cd8b0ffeac81b407b29ade12219 Parents: 7b5679c Author: Siddharth Wagle <swa...@hortonworks.com> Authored: Tue Sep 26 15:56:28 2017 -0700 Committer: Siddharth Wagle <swa...@hortonworks.com> Committed: Tue Sep 26 15:56:28 2017 -0700 ---------------------------------------------------------------------- .../sink/timeline/cache/HandleConnectExceptionTest.java | 5 +++++ .../controller/metrics/timeline/MetricsRequestHelper.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ee8b3d9f/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 77aba6b..4bcc2fb 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 @@ -213,6 +213,11 @@ public class HandleConnectExceptionTest { } @Override + protected String getHostInMemoryAggregationProtocol() { + return "http"; + } + + @Override public boolean emitMetrics(TimelineMetrics metrics) { super.init(); return super.emitMetrics(metrics); http://git-wip-us.apache.org/repos/asf/ambari/blob/ee8b3d9f/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java index 5331694..688e7f3 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java @@ -87,7 +87,7 @@ public class MetricsRequestHelper { uriBuilder.setParameter("precision", higherPrecision); String newSpec = uriBuilder.toString(); connection = streamProvider.processURL(newSpec, HttpMethod.GET, (String) null, - Collections.<String, List<String>>emptyMap()); + Collections.<String, List<String>> emptyMap()); if (!checkConnectionForPrecisionException(connection)) { throw new IOException("Encountered Precision exception : Higher precision request also failed."); }
