YARN-3726. Fix TestHBaseTimelineWriterImpl unit test failure by fixing its test data (Vrushali C via sjlee)
(cherry picked from commit 4c0b6d73914f2e249795deb292f508177ea54884) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/783f95fc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/783f95fc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/783f95fc Branch: refs/heads/YARN-2928-rebase Commit: 783f95fc4f34fff5f7bcf2c19f3d77945defe31b Parents: 6ac1fa7 Author: Sangjin Lee <sj...@apache.org> Authored: Wed May 27 20:28:04 2015 -0700 Committer: Sangjin Lee <sj...@apache.org> Committed: Sat Oct 10 14:56:40 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 4 ++++ .../storage/TestHBaseTimelineWriterImpl.java | 15 ++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/783f95fc/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 42ee90c..87a24f1 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -75,6 +75,10 @@ Branch YARN-2928: Timeline Server Next Generation: Phase 1 YARN-3411. [Storage implementation] explore the native HBase write schema for storage (Vrushali C via sjlee) + + YARN-3726. Fix TestHBaseTimelineWriterImpl unit test failure by fixing its + test data (Vrushali C via sjlee) + IMPROVEMENTS OPTIMIZATIONS http://git-wip-us.apache.org/repos/asf/hadoop/blob/783f95fc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineWriterImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineWriterImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineWriterImpl.java index 48bacd6..f999b4d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineWriterImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineWriterImpl.java @@ -121,12 +121,13 @@ public class TestHBaseTimelineWriterImpl { TimelineMetric m1 = new TimelineMetric(); m1.setId("MAP_SLOT_MILLIS"); Map<Long, Number> metricValues = new HashMap<Long, Number>(); - metricValues.put(1429741609000L, 100000000); - metricValues.put(1429742609000L, 200000000); - metricValues.put(1429743609000L, 300000000); - metricValues.put(1429744609000L, 400000000); - metricValues.put(1429745609000L, 50000000000L); - metricValues.put(1429746609000L, 60000000000L); + long ts = System.currentTimeMillis(); + metricValues.put(ts - 120000, 100000000); + metricValues.put(ts - 100000, 200000000); + metricValues.put(ts - 80000, 300000000); + metricValues.put(ts - 60000, 400000000); + metricValues.put(ts - 40000, 50000000000L); + metricValues.put(ts - 20000, 60000000000L); m1.setType(Type.TIME_SERIES); m1.setValues(metricValues); metrics.add(m1); @@ -216,7 +217,7 @@ public class TestHBaseTimelineWriterImpl { private void checkMetricsTimeseries(List<Cell> metricCells, TimelineMetric m1) throws IOException { Map<Long, Number> timeseries = m1.getValues(); - assertEquals(metricCells.size(), timeseries.size()); + assertEquals(timeseries.size(), metricCells.size()); for (Cell c1 : metricCells) { assertTrue(timeseries.containsKey(c1.getTimestamp())); assertEquals(GenericObjectMapper.read(CellUtil.cloneValue(c1)),