From 65f7ec2f39d619ab5116c7a6a0ed11a0658d249b Mon Sep 17 00:00:00 2001 From: Inigo Goiri Date: Thu, 15 Nov 2018 09:25:25 -0800 Subject: [PATCH] YARN-8856. TestTimelineReaderWebServicesHBaseStorage tests failing with NoClassDefFoundError. Contributed by Sushil Ks. (cherry picked from commit eeaf8edaa7d36715dfa00a29fe46e4c6de4b98cf) --- .../pom.xml | 7 ++++ .../reader/DummyTimelineReaderMetrics.java | 39 +++++++++++++++++++ ...TimelineReaderWebServicesHBaseStorage.java | 11 ++++++ .../metrics/TimelineReaderMetrics.java | 5 ++- 4 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/DummyTimelineReaderMetrics.java diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml index 2c2dd0f479e..7159401ed98 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml @@ -317,6 +317,13 @@ test + + org.jmockit + jmockit + 1.24 + test + + org.apache.hbase hbase-testing-util diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/DummyTimelineReaderMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/DummyTimelineReaderMetrics.java new file mode 100644 index 00000000000..2cdc18efa22 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/DummyTimelineReaderMetrics.java @@ -0,0 +1,39 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.timelineservice.reader; + +import org.apache.hadoop.yarn.server.timelineservice.metrics.TimelineReaderMetrics; + +/** + * DummyTimelineReaderMetrics for mocking {@link TimelineReaderMetrics} calls. + */ +public class DummyTimelineReaderMetrics extends TimelineReaderMetrics { + + + @Override + public void addGetEntitiesLatency( + long durationMs, boolean succeeded) { + + } + + @Override + public void addGetEntityTypesLatency( + long durationMs, boolean succeeded) { + } +} \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java index a42cf7026be..abd5362c8e7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java @@ -35,6 +35,8 @@ import java.util.Set; import javax.ws.rs.core.MediaType; +import mockit.Mock; +import mockit.MockUp; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.yarn.api.records.ApplicationId; @@ -50,6 +52,7 @@ import org.apache.hadoop.yarn.api.records.timelineservice.TimelineMetric; import org.apache.hadoop.yarn.api.records.timelineservice.TimelineMetric.Type; import org.apache.hadoop.yarn.server.metrics.ApplicationMetricsConstants; import org.apache.hadoop.yarn.server.timelineservice.collector.TimelineCollectorContext; +import org.apache.hadoop.yarn.server.timelineservice.metrics.TimelineReaderMetrics; import org.apache.hadoop.yarn.server.timelineservice.storage.HBaseTimelineWriterImpl; import org.apache.hadoop.yarn.server.timelineservice.storage.common.HBaseTimelineSchemaUtils; import org.apache.hadoop.yarn.server.utils.BuilderUtils; @@ -73,9 +76,17 @@ public class TestTimelineReaderWebServicesHBaseStorage private static long dayTs = HBaseTimelineSchemaUtils.getTopOfTheDayTimestamp(ts); private static String doAsUser = "remoteuser"; + private static final DummyTimelineReaderMetrics METRICS + = new DummyTimelineReaderMetrics(); @BeforeClass public static void setupBeforeClass() throws Exception { + new MockUp() { + @Mock + public TimelineReaderMetrics getInstance() { + return METRICS; + } + }; setup(); loadData(); initialize(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/metrics/TimelineReaderMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/metrics/TimelineReaderMetrics.java index 3131748d993..fbe96aaa5a9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/metrics/TimelineReaderMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/metrics/TimelineReaderMetrics.java @@ -33,7 +33,7 @@ import static org.apache.hadoop.metrics2.lib.Interns.info; * Metrics class for TimelineReader. */ @Metrics(about = "Metrics for timeline reader", context = "timelineservice") -final public class TimelineReaderMetrics { +public class TimelineReaderMetrics { private final static MetricsInfo METRICS_INFO = info("TimelineReaderMetrics", "Metrics for TimelineReader"); @@ -50,7 +50,8 @@ final public class TimelineReaderMetrics { @Metric(about = "GET entity types success latency", valueName = "latency") private MutableQuantiles getEntityTypesSuccessLatency; - private TimelineReaderMetrics() { + @VisibleForTesting + protected TimelineReaderMetrics() { } public static TimelineReaderMetrics getInstance() {