Repository: ambari Updated Branches: refs/heads/trunk 7f753b444 -> 4189dcca8
AMBARI-10809. AMS: navigating graph time ranges are not correct. Unit test fix. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4189dcca Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4189dcca Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4189dcca Branch: refs/heads/trunk Commit: 4189dcca8ea334b099aed550191148fbc2c7395e Parents: 7f753b4 Author: Siddharth Wagle <swa...@hortonworks.com> Authored: Wed Apr 29 13:59:47 2015 -0700 Committer: Siddharth Wagle <swa...@hortonworks.com> Committed: Wed Apr 29 13:59:47 2015 -0700 ---------------------------------------------------------------------- .../metrics/MetricsPaddingMethod.java | 3 +- .../timeline/AMSPropertyProviderTest.java | 2 +- .../resources/ams/multiple_host_metrics.json | 172 +++++++++---------- 3 files changed, 89 insertions(+), 88 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4189dcca/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsPaddingMethod.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsPaddingMethod.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsPaddingMethod.java index a78beee..32d214d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsPaddingMethod.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsPaddingMethod.java @@ -25,6 +25,7 @@ import java.util.TreeMap; public class MetricsPaddingMethod { private final PADDING_STRATEGY strategy; public static final String ZERO_PADDING_PARAM = "params/padding"; + private static final long MINIMUM_STEP_INTERVAL = 999l; // ~ 1 second public static enum PADDING_STRATEGY { ZEROS, NULLS, @@ -55,7 +56,7 @@ public class MetricsPaddingMethod { long dataInterval = getTimelineMetricInterval(values); - if (dataInterval == -1) { + if (dataInterval == -1 || dataInterval < MINIMUM_STEP_INTERVAL) { dataInterval = temporalInfo.getStep() != null ? temporalInfo.getStep() : -1; } // Unable to determine what interval to use for padding http://git-wip-us.apache.org/repos/asf/ambari/blob/4189dcca/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java index 78e1831..b72dcaf 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java @@ -364,7 +364,7 @@ public class AMSPropertyProviderTest { uriBuilder.addParameter("endTime", "1421697600"); Assert.assertEquals(uriBuilder.toString(), streamProvider.getLastSpec()); Number[][] val = (Number[][]) res.getPropertyValue(propertyId); - Assert.assertEquals(188, val.length); + Assert.assertEquals(189, val.length); } @Test http://git-wip-us.apache.org/repos/asf/ambari/blob/4189dcca/ambari-server/src/test/resources/ams/multiple_host_metrics.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/ams/multiple_host_metrics.json b/ambari-server/src/test/resources/ams/multiple_host_metrics.json index 019dc62..2868573 100644 --- a/ambari-server/src/test/resources/ams/multiple_host_metrics.json +++ b/ambari-server/src/test/resources/ams/multiple_host_metrics.json @@ -125,92 +125,92 @@ "appid": "HOST", "starttime": 1416445244801, "metrics": { - "1416486250037": "2.46272E8", - "1416486255040": "2.46145024E8", - "1416486260042": "2.46280192E8", - "1416486265047": "2.4641536E8", - "1416486270053": "2.44318208E8", - "1416486275058": "2.464768E8", - "1416486280063": "2.464768E8", - "1416486285067": "2.464768E8", - "1416486290072": "2.46898688E8", - "1416486295077": "2.46898688E8", - "1416486300083": "2.46898688E8", - "1416486305088": "2.46898688E8", - "1416486310093": "2.4676352E8", - "1416486315097": "2.4676352E8", - "1416486320102": "2.46898688E8", - "1416486325105": "2.46898688E8", - "1416486330107": "2.46898688E8", - "1416486335113": "2.47025664E8", - "1416486340118": "2.47025664E8", - "1416486345123": "2.46898688E8", - "1416486350128": "2.46595584E8", - "1416486355133": "2.46341632E8", - "1416486360135": "2.464768E8", - "1416486365140": "2.46603776E8", - "1416486370145": "2.46468608E8", - "1416486375151": "2.46341632E8", - "1416486380156": "2.464768E8", - "1416486385161": "2.464768E8", - "1416486390166": "2.464768E8", - "1416486395169": "2.464768E8", - "1416486400172": "2.464768E8", - "1416486405177": "2.46603776E8", - "1416486410180": "2.46898688E8", - "1416486415182": "2.47025664E8", - "1416486420187": "2.47025664E8", - "1416486425193": "2.47025664E8", - "1416486430198": "2.46890496E8", - "1416486435203": "2.4676352E8", - "1416486440208": "2.46898688E8", - "1416486445213": "2.46890496E8", - "1416486450218": "2.46890496E8", - "1416486455223": "2.46890496E8", - "1416486460224": "2.46890496E8", - "1416486465229": "2.46890496E8", - "1416486470230": "2.4643584E8", - "1416486475235": "2.46181888E8", - "1416486480237": "2.4619008E8", - "1416486485242": "2.46317056E8", - "1416486490244": "2.46181888E8", - "1416486495249": "2.46181888E8", - "1416486500255": "2.46317056E8", - "1416486505260": "2.46317056E8", - "1416486510261": "2.46317056E8", - "1416486515266": "2.4619008E8", - "1416486520270": "2.4619008E8", - "1416486525276": "2.46317056E8", - "1416486530279": "2.46890496E8", - "1416486535282": "2.46890496E8", - "1416486540287": "2.46890496E8", - "1416486545291": "2.47017472E8", - "1416486550295": "2.46882304E8", - "1416486555300": "2.46882304E8", - "1416486560301": "2.46890496E8", - "1416486565306": "2.47025664E8", - "1416486570309": "2.47025664E8", - "1416486575314": "2.47025664E8", - "1416486580315": "2.47025664E8", - "1416486585321": "2.47025664E8", - "1416486590325": "2.4672256E8", - "1416486595327": "2.46468608E8", - "1416486600331": "2.46603776E8", - "1416486605336": "2.46603776E8", - "1416486610337": "2.46595584E8", - "1416486615342": "2.46468608E8", - "1416486620345": "2.46603776E8", - "1416486625350": "2.46730752E8", - "1416486630354": "2.46730752E8", - "1416486635365": "2.46603776E8", - "1416486640360": "2.46603776E8", - "1416486645368": "2.46730752E8", - "1416486650370": "2.47025664E8", - "1416486655375": "2.4715264E8", - "1416486660380": "2.4715264E8", - "1416486665385": "2.4715264E8", - "1416486675392": "2.46890496E8", - "1416486690404": "2.47025664E8" + "1416445244801": "2.46272E8", + "1416445259801": "2.46145024E8", + "1416445274801": "2.46280192E8", + "1416445289801": "2.4641536E8", + "1416445304801": "2.44318208E8", + "1416445319801": "2.464768E8", + "1416445364801": "2.464768E8", + "1416445379801": "2.464768E8", + "1416445394801": "2.46898688E8", + "1416445409801": "2.46898688E8", + "1416445424801": "2.46898688E8", + "1416445439801": "2.46898688E8", + "1416445484801": "2.4676352E8", + "1416445499801": "2.4676352E8", + "1416445514801": "2.46898688E8", + "1416445529801": "2.46898688E8", + "1416445544801": "2.46898688E8", + "1416445559801": "2.47025664E8", + "1416445604801": "2.47025664E8", + "1416445619801": "2.46898688E8", + "1416445634801": "2.46595584E8", + "1416445649801": "2.46341632E8", + "1416445664801": "2.464768E8", + "1416445679801": "2.46603776E8", + "1416445724801": "2.46468608E8", + "1416445739801": "2.46341632E8", + "1416445964801": "2.464768E8", + "1416445979801": "2.464768E8", + "1416445994801": "2.464768E8", + "1416446009801": "2.464768E8", + "1416446024801": "2.464768E8", + "1416446084801": "2.46603776E8", + "1416446099801": "2.46898688E8", + "1416446114801": "2.47025664E8", + "1416446129801": "2.47025664E8", + "1416446144801": "2.47025664E8", + "1416446204801": "2.46890496E8", + "1416446219801": "2.4676352E8", + "1416446234801": "2.46898688E8", + "1416446249801": "2.46890496E8", + "1416446264801": "2.46890496E8", + "1416446324801": "2.46890496E8", + "1416446339801": "2.46890496E8", + "1416446354801": "2.46890496E8", + "1416446369801": "2.4643584E8", + "1416446384801": "2.46181888E8", + "1416446444801": "2.4619008E8", + "1416446459801": "2.46317056E8", + "1416446474801": "2.46181888E8", + "1416446489801": "2.46181888E8", + "1416446504801": "2.46317056E8", + "1416446564801": "2.46317056E8", + "1416446579801": "2.46317056E8", + "1416446594801": "2.4619008E8", + "1416446609801": "2.4619008E8", + "1416446624801": "2.46317056E8", + "1416446684801": "2.46890496E8", + "1416446699801": "2.46890496E8", + "1416446714801": "2.46890496E8", + "1416446729801": "2.47017472E8", + "1416446744801": "2.46882304E8", + "1416446804801": "2.46882304E8", + "1416446819801": "2.46890496E8", + "1416446834801": "2.47025664E8", + "1416446849801": "2.47025664E8", + "1416446864801": "2.47025664E8", + "1416446924801": "2.47025664E8", + "1416446939801": "2.47025664E8", + "1416446954801": "2.4672256E8", + "1416446969801": "2.46468608E8", + "1416446984801": "2.46603776E8", + "1416447044801": "2.46603776E8", + "1416447059801": "2.46595584E8", + "1416447074801": "2.46468608E8", + "1416447089801": "2.46603776E8", + "1416447104801": "2.46730752E8", + "1416447164801": "2.46730752E8", + "1416447179801": "2.46603776E8", + "1416447194801": "2.46603776E8", + "1416447209801": "2.46730752E8", + "1416447224801": "2.47025664E8", + "1416447284801": "2.4715264E8", + "1416447299801": "2.4715264E8", + "1416447314801": "2.4715264E8", + "1416447329801": "2.46890496E8", + "1416447344801": "2.47025664E8" } } ]} \ No newline at end of file
