summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2021-01-26 09:58:19 +0100
committergjoranv <gv@verizonmedia.com>2021-01-26 09:58:19 +0100
commit6d4bd3b3b522a199261eb8a92f13f31a67a44186 (patch)
tree2b465c4f7aaa56801fb870e4bf42427a9b950baf
parent0d528c4ffa341eb8fdcae93ae95328cf5073cdc0 (diff)
Remove irrelevant test (StateMonitor does not use threads anymore)
-rw-r--r--container-core/src/test/java/com/yahoo/container/jdisc/state/MetricConsumerProviders.java21
-rw-r--r--container-core/src/test/java/com/yahoo/container/jdisc/state/StateMonitorBenchmarkTest.java77
2 files changed, 0 insertions, 98 deletions
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricConsumerProviders.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricConsumerProviders.java
deleted file mode 100644
index 777f43c5607..00000000000
--- a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricConsumerProviders.java
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.jdisc.state;
-
-import com.google.inject.Provider;
-import com.yahoo.jdisc.application.MetricConsumer;
-
-/**
- * @author Simon Thoresen Hult
- */
-class MetricConsumerProviders {
-
- public static Provider<MetricConsumer> wrap(final StateMonitor statetMonitor) {
- return new Provider<MetricConsumer>() {
-
- @Override
- public MetricConsumer get() {
- return statetMonitor.newMetricConsumer();
- }
- };
- }
-}
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/StateMonitorBenchmarkTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/StateMonitorBenchmarkTest.java
deleted file mode 100644
index 22a2fc274c7..00000000000
--- a/container-core/src/test/java/com/yahoo/container/jdisc/state/StateMonitorBenchmarkTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.jdisc.state;
-
-import com.google.inject.Provider;
-import com.yahoo.jdisc.Metric;
-import com.yahoo.jdisc.application.ContainerThread;
-import com.yahoo.jdisc.application.MetricConsumer;
-import com.yahoo.jdisc.application.MetricProvider;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertTrue;
-
-/**
- * @author Simon Thoresen Hult
- */
-public class StateMonitorBenchmarkTest {
-
- private final static int NUM_THREADS = 32;
- private final static int NUM_UPDATES = 1000;//0000;
-
- @Test
- public void requireThatHealthMonitorDoesNotBlockMetricThreads() throws Exception {
- StateMonitor monitor = StateMonitor.createForTesting();
- Provider<MetricConsumer> provider = MetricConsumerProviders.wrap(monitor);
- performUpdates(provider, 8);
- for (int i = 1; i <= NUM_THREADS; i *= 2) {
- long millis = performUpdates(provider, i);
- System.err.format("%2d threads, %5d millis => %9d ups\n",
- i, millis, (int)((i * NUM_UPDATES) / (millis / 1000.0)));
- }
- monitor.deconstruct();
- }
-
- private long performUpdates(Provider<MetricConsumer> metricProvider, int numThreads) throws Exception {
- ThreadFactory threadFactory = new ContainerThread.Factory(metricProvider);
- ExecutorService executor = Executors.newFixedThreadPool(numThreads, threadFactory);
- List<Callable<Boolean>> tasks = new ArrayList<>(numThreads);
- for (int i = 0; i < numThreads; ++i) {
- tasks.add(new UpdateTask(new MetricProvider(metricProvider).get()));
- }
- long before = System.nanoTime();
- List<Future<Boolean>> results = executor.invokeAll(tasks);
- long after = System.nanoTime();
- for (Future<Boolean> result : results) {
- assertTrue(result.get());
- }
- return TimeUnit.NANOSECONDS.toMillis(after - before);
- }
-
- public static class UpdateTask implements Callable<Boolean> {
-
- final Metric metric;
-
- UpdateTask(Metric metric) {
- this.metric = metric;
- }
-
- @Override
- public Boolean call() throws Exception {
- Metric.Context ctx = metric.createContext(Collections.<String, Object>emptyMap());
- for (int i = 0; i < NUM_UPDATES; ++i) {
- metric.add("foo", 69L, ctx);
- }
- return true;
- }
- }
-}