FELIX-3910: removing the two race tests because they are reproducing too much race conditions issues, which
can't be easily fixed in the current trunk (all the race conditions have been fixed in the upcomming dependencymanager 4.0 release).
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1607332 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectRaceTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectRaceTest.java
deleted file mode 100644
index a4423c0..0000000
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectRaceTest.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * 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.felix.dm.test.integration.api;
-
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-import junit.framework.Assert;
-
-import org.apache.felix.dm.Component;
-import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.test.components.Ensure;
-import org.apache.felix.dm.test.integration.common.TestBase;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-
-@RunWith(PaxExam.class)
-public class AspectRaceTest extends TestBase {
- volatile ExecutorService m_serviceExec;
- volatile ExecutorService m_aspectExec;
- volatile DependencyManager m_dm;
- final static int SERVICES = 3;
- final static int ASPECTS_PER_SERVICE = 10;
-
- @Test
- public void testConcurrentAspects() {
- try {
- warn("starting aspect race test");
- int cores = Math.max(4, Runtime.getRuntime().availableProcessors());
- // Used to inject S services
- m_serviceExec = Executors.newFixedThreadPool(cores);
- // Used to inject S Aspects
- m_aspectExec = Executors.newFixedThreadPool(cores);
-
- // Setup test components using dependency manager.
- // We create a Controller which is injected with some S services,
- // and each S services has some aspects (SAspect).
-
- m_dm = new DependencyManager(context);
- Controller controller = new Controller();
- Component c = m_dm
- .createComponent()
- .setImplementation(controller)
- .setInterface(Controller.class.getName(), null)
- .setComposition("getComposition")
- .add(m_dm.createServiceDependency().setService(S.class)
- .setCallbacks("bind", null, "unbind", "swap")
- .setRequired(true));
-
- m_dm.add(c);
-
- for (int loop = 1; loop <= 3000; loop++) {
- // Perform concurrent injections of "S" service and S aspects
- // into the Controller component;
- Factory f = new Factory();
- f.register();
-
- controller.check();
-
- // unregister all services and aspects concurrently
- f.unregister();
-
- if ((loop) % 100 == 0) {
- warn("Performed " + loop + " tests.");
- }
-
- if (super.errorsLogged()) {
- throw new IllegalStateException("Race test interrupted (some error occured, see previous logs)");
- }
- }
- }
-
- catch (Throwable t) {
- error("Test failed", t);
- Assert.fail("Test failed: " + t.getMessage());
- } finally {
- shutdown(m_serviceExec);
- shutdown(m_aspectExec);
- m_dm.clear();
- }
- }
-
- void shutdown(ExecutorService exec) {
- exec.shutdown();
- try {
- exec.awaitTermination(5, TimeUnit.SECONDS);
- } catch (InterruptedException e) {
- }
- }
-
- public interface S {
- void invoke(Ensure e);
- }
-
- public static class SImpl implements S {
- final int m_step;
-
- SImpl(int step) {
- m_step = step;
- }
-
- public void invoke(Ensure e) {
- e.step(m_step);
- }
-
- public String toString() {
- return "SImpl[" + m_step + "]";
- }
- }
-
- public static class SAspect implements S {
- volatile S m_next;
- final int m_rank;
- final int m_step;
-
- SAspect(int rank) {
- m_rank = rank;
- m_step = ASPECTS_PER_SERVICE - rank + 1;
- }
-
- public void added(S s) {
- m_next = s;
- }
-
- public void swap(S oldS, S newS) {
- m_next = newS;
- }
-
- public void invoke(Ensure e) {
- e.step(m_step);
- m_next.invoke(e);
- }
-
- public String toString() {
- return "SAspect[" + m_rank + ", " + m_step + "]";
- }
- }
-
- class Factory {
- final ConcurrentLinkedQueue<Component> m_services = new ConcurrentLinkedQueue<Component>();
- final ConcurrentLinkedQueue<Component> m_aspects = new ConcurrentLinkedQueue<Component>();
-
- public void register() throws InterruptedException {
- final CountDownLatch latch = new CountDownLatch(SERVICES
- + (ASPECTS_PER_SERVICE * SERVICES));
-
- for (int i = 1; i <= SERVICES; i++) {
- final int serviceId = i;
- m_serviceExec.execute(new Runnable() {
- public void run() {
- try {
- Component c = m_dm.createComponent();
- Hashtable<String, String> props = new Hashtable<String, String>();
- props.put("id", String.valueOf(serviceId));
- c.setInterface(S.class.getName(), props)
- .setImplementation(
- new SImpl(ASPECTS_PER_SERVICE + 1));
- m_services.add(c);
- m_dm.add(c);
- latch.countDown();
- } catch (Throwable e) {
- error(e);
- }
- }
- });
-
- for (int j = 1; j <= ASPECTS_PER_SERVICE; j++) {
- final int rank = j;
- m_aspectExec.execute(new Runnable() {
- public void run() {
- try {
- SAspect sa = new SAspect(rank);
- Component aspect = m_dm.createAspectService(
- S.class, "(id=" + serviceId + ")",
- rank, "added", null, null, "swap")
- .setImplementation(sa);
- debug("adding aspect " + sa);
- m_aspects.add(aspect);
- m_dm.add(aspect);
- latch.countDown();
- } catch (Throwable e) {
- error(e);
- }
- }
- });
- }
- }
-
- if (!latch.await(5000, TimeUnit.MILLISECONDS)) {
- throw new IllegalStateException(
- "could not register services and aspects timely");
- }
-
- debug("all registered: aspects=" + m_aspects);
- // Thread.sleep(5000);
- }
-
- public void unregister() throws InterruptedException,
- InvalidSyntaxException {
- final CountDownLatch latch = new CountDownLatch(SERVICES
- + (ASPECTS_PER_SERVICE * SERVICES));
-
- unregisterAspects(latch);
- unregisterServices(latch);
-
- if (!latch.await(5000, TimeUnit.MILLISECONDS)) {
- throw new IllegalStateException(
- "could not unregister services and aspects timely");
- }
-
- if (context.getServiceReference(S.class.getName()) != null) {
- error("could not unregister some services or aspects !");
- }
- debug("unregistered all aspects and services concurrently");
- }
-
- public void unregisterAspects(final CountDownLatch latch)
- throws InterruptedException, InvalidSyntaxException {
- Component c;
- debug("unregister: aspects=" + m_aspects);
-
- while ((c = m_aspects.poll()) != null) {
- final Component c$ = c;
- m_serviceExec.execute(new Runnable() {
- public void run() {
- try {
- debug("removing service " + c$);
- m_dm.remove(c$);
- latch.countDown();
- } catch (Throwable e) {
- error(e);
- }
- }
- });
- }
- }
-
- public void unregisterServices(final CountDownLatch latch)
- throws InterruptedException {
- Component c;
- debug("unregister: services=" + m_services);
-
- while ((c = m_services.poll()) != null) {
- final Component c$ = c;
- m_serviceExec.execute(new Runnable() {
- public void run() {
- try {
- debug("removing service " + c$);
- m_dm.remove(c$);
- latch.countDown();
- } catch (Throwable e) {
- error(e);
- }
- }
- });
- }
-
- debug("unregistered all services");
- }
- }
-
- public class Controller {
- final Composition m_compo = new Composition();
- final HashSet<S> m_services = new HashSet<S>();
-
- Object[] getComposition() {
- return new Object[] { this, m_compo };
- }
-
- void bind(ServiceReference sr) {
- S s = (S) sr.getBundle().getBundleContext().getService(sr);
- if (s == null) {
- throw new IllegalStateException(
- "bindA: bundleContext.getService returned null");
- }
- debug("bind " + s);
- synchronized (this) {
- m_services.add(s);
- }
- }
-
- void swap(S previous, S current) {
- debug("swap: " + previous + "," + current);
- synchronized (this) {
- if (!m_services.remove(previous)) {
- error("swap: unknow previous service: " + previous);
- }
- m_services.add(current);
- }
- }
-
- void unbind(S a) {
- debug("unbind " + a);
- synchronized (this) {
- m_services.remove(a);
- }
- }
-
- void check() {
- synchronized (this) {
- for (S s : m_services) {
- debug("checking service: " + s + " ...");
- Ensure ensure = new Ensure(false);
- s.invoke(ensure);
- }
- }
- }
- }
-
- public static class Composition {
- }
-}
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceRaceTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceRaceTest.java
deleted file mode 100644
index 5f79c78..0000000
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceRaceTest.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * 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.felix.dm.test.integration.api;
-
-import java.io.IOException;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Queue;
-import java.util.Random;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-import javax.inject.Inject;
-
-import junit.framework.Assert;
-
-import org.apache.felix.dm.Component;
-import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.test.components.Ensure;
-import org.apache.felix.dm.test.integration.common.TestBase;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
-
-/**
- * Another race test for concurrent service registrations/unregistrations.
- * Aspects are also depending on some configuration pids, which are also registered/unregistered concurrently.
- */
-@RunWith(PaxExam.class)
-public class ServiceRaceTest extends TestBase {
- final static int STEP_WAIT = 10000;
- final static int SERVICES = 3;
- final static int INVOKES = 10;
- volatile ExecutorService m_execServices; // used to register/unregister S services
- volatile ExecutorService m_execAspects; // used to register/unregister Aspects
-
- @Inject
- volatile ConfigurationAdmin m_ca;
-
- @Test
- public void testConcurrentServices() {
- warn("starting concurrent services");
- int cores = Math.max(10, Runtime.getRuntime().availableProcessors());
- final DependencyManager dm = new DependencyManager(context);
- Random rnd = new Random();
-
- try {
- m_execServices = Executors.newFixedThreadPool(cores);
- m_execAspects = Executors.newFixedThreadPool(cores);
- int serviceIdCounter = 1;
- long timeStamp = System.currentTimeMillis();
- final int tests = 30000;
- for (int loop = 0; loop < tests; loop++) {
- debug("loop#%d -------------------------", (loop + 1));
-
- final Ensure clientStarted = new Ensure(false);
- final Ensure clientStopped = new Ensure(false);
- final Ensure servicesStopped = new Ensure(false);
- final Ensure servicesInvoked = new Ensure(false);
- final Ensure aspectsInvoked = new Ensure(false);
- final Ensure aspectsRemoved = new Ensure(false);
-
- // Create one client depending on many S services
- Client client = new Client(clientStarted, clientStopped);
- Component c = dm.createComponent().setImplementation(client);
- for (int i = 0; i < SERVICES; i++) {
- String filter = "(name=S" + i + "-" + serviceIdCounter + ")";
- c.add(dm.createServiceDependency().setService(S.class, filter).setRequired(true).setCallbacks(
- "add", null, "remove", "swap"));
- }
- dm.add(c);
-
- // Create S services concurrently
- info("registering S services concurrently");
- final ConcurrentLinkedQueue<Component> services = new ConcurrentLinkedQueue<Component>();
- for (int i = 0; i < SERVICES; i++) {
- final String name = "S" + i + "-" + serviceIdCounter;
- Hashtable h = new Hashtable();
- h.put("name", name);
- final Component sImpl = dm.createComponent().setImplementation(
- new SImpl(servicesStopped, servicesInvoked, name)).setInterface(
- S.class.getName(), h);
- services.add(sImpl);
- m_execServices.execute(new Runnable() {
- public void run() {
- dm.add(sImpl);
- }
- });
- }
-
- // Create S aspects concurrently
- info("registering aspects concurrently");
- final Queue<Component> aspects = new ConcurrentLinkedQueue<Component>();
- for (int i = 0; i < SERVICES; i++) {
- final String name = "Aspect" + i + "-" + serviceIdCounter;
- final String filter = "(name=S" + i + "-" + serviceIdCounter + ")";
- final String pid = "Aspect" + i + "-" + serviceIdCounter + ".pid";
- final int rank = (i+1);
- SAspect sa = new SAspect(aspectsInvoked, name, rank);
- debug("Adding aspect " + sa);
- final Component aspect = dm.createAspectService(S.class, filter, rank).setImplementation(sa).add(
- dm.createConfigurationDependency().setPid(pid));
- aspects.add(aspect);
- m_execAspects.execute(new Runnable() {
- public void run() {
- dm.add(aspect);
- }
- });
- }
-
- // Provide all aspect configuration (asynchronously)
- final Queue<Configuration> aspectPids = new ConcurrentLinkedQueue<Configuration>();
- for (int i = 0; i < SERVICES; i++) {
- final String name = "Aspect" + i + "-" + serviceIdCounter;
- final String pid = "Aspect" + i + "-" + serviceIdCounter + ".pid";
- final int rank = (i+1);
- SAspect sa = new SAspect(aspectsInvoked, name, rank);
- debug("Adding aspect configuration pid %s for aspect %s", pid, sa);
- try {
- Configuration aspectConf = m_ca.getConfiguration(pid, null);
- aspectConf.update(new Hashtable() {
- {
- put("name", name);
- }
- });
- aspectPids.add(aspectConf);
- }
- catch (IOException e) {
- error("could not create pid %s for aspect %s", e, pid, name);
- }
- }
-
- // Increment service id counter, for next iteration.
- serviceIdCounter ++;
-
- // Make sure client is started
- clientStarted.waitForStep(1, STEP_WAIT);
- info("all services have been started");
-
- // Make sure client invoked services SERVICES * INVOKES times
- servicesInvoked.waitForStep(SERVICES * INVOKES, STEP_WAIT);
- info("All services have been properly invoked");
-
- // Now ensure that some random aspects have been randomly invoked.
- int aspectCount = Math.min(1, rnd.nextInt(SERVICES));
- int aspectInvocations = Math.min(1, rnd.nextInt(INVOKES));
- aspectsInvoked.waitForStep(aspectCount * aspectInvocations, STEP_WAIT);
- info("%d aspects have been properly invoked %d times", aspectCount, aspectInvocations);
-
- // Unregister services concurrently (at this point, it is possible that we have still some aspects being activating !
- info("unregistering services concurrently");
- for (final Component sImpl : services) {
- m_execServices.execute(new Runnable() {
- public void run() {
- dm.remove(sImpl);
- }
- });
- }
-
- // unregister aspects concurrently (some aspects can potentially be still activating !)
- info("unregistering aspects concurrently");
- for (final Component a : aspects) {
- m_execAspects.execute(new Runnable() {
- public void run() {
- debug("removing aspect %s", a);
- dm.remove(a);
- aspectsRemoved.step();
- }
- });
- }
-
- info("unregistering aspects configuration concurrently");
- for (Configuration aspectConf : aspectPids) {
- aspectConf.delete(); // asynchronous
- }
-
- info("removing client");
- dm.remove(c);
-
- // Wait until all services have been stopped
- servicesStopped.waitForStep(SERVICES, STEP_WAIT);
-
- // Wait until client has been stopped
- clientStopped.waitForStep(1, STEP_WAIT);
-
- // Wait until all aspects have been deleted
- aspectsRemoved.waitForStep(SERVICES, STEP_WAIT);
-
- if (super.errorsLogged()) {
- throw new IllegalStateException("Race test interrupted (some error occured, see previous logs)");
- }
-
- info("finished one test loop: current components=%d", dm.getComponents().size());
- if ((loop + 1) % 100 == 0) {
- long duration = System.currentTimeMillis() - timeStamp;
- warn("Performed %d tests (total=%d) in %d ms.", (loop + 1), tests, duration);
- timeStamp = System.currentTimeMillis();
- }
-
- // Cleanup all remaining components (but all components should have been removed now).
- dm.clear();
- }
- }
-
- catch (Throwable t) {
- error("Test failed", t);
- Assert.fail("Test failed: " + t.getMessage());
- }
- finally {
- shutdown(m_execServices);
- shutdown(m_execAspects);
- dm.clear();
- }
- }
-
- void shutdown(ExecutorService exec) {
- exec.shutdown();
- try {
- exec.awaitTermination(5, TimeUnit.SECONDS);
- }
- catch (InterruptedException e) {
- }
- }
-
- public interface S {
- void invoke(int prevAspectId);
- }
-
- public class SImpl implements S {
- final Ensure m_stopped, m_invoked;
- final String m_name;
-
- public SImpl(Ensure stopped, Ensure invoked, String name) {
- m_name = name;
- m_stopped = stopped;
- m_invoked = invoked;
- }
-
- public void invoke(int prevRank) {
- Assert.assertTrue(prevRank > 0);
- m_invoked.step();
- }
-
- public String toString() {
- return m_name;
- }
-
- public void start() {
- info("started %s", this);
- }
-
- public void stop() {
- info("stopped %s", this);
- m_stopped.step();
- }
- }
-
- public class Client implements Runnable {
- final Ensure m_started, m_stopped;
- final Map<String, S> m_services = new ConcurrentHashMap<String, S>();
- volatile Thread m_thread;
- volatile Exception m_firstStartStackTrace;
- volatile boolean m_running;
-
- Client(Ensure started, Ensure stopped) {
- m_started = started;
- m_stopped = stopped;
- }
-
- synchronized void swap(ServiceReference prevRef, S prev, ServiceReference nextRef, S next) {
- info("client.swap: prev=%s, next=%s", prev, next);
- m_services.put((String) nextRef.getProperty("name"), next);
- }
-
- synchronized void add(Map<String, String> props, S s) {
- info("client.add: %s", s);
- m_services.put(props.get("name"), s);
- }
-
- synchronized void remove(Map<String, String> props, S s) {
- info("client.remove: %s", s);
- m_services.remove(props.get("name"));
- }
-
- public synchronized void start() {
- if (m_firstStartStackTrace != null) {
- error("client already started", new Exception());
- error("first start was done here:", m_firstStartStackTrace);
- return;
- }
- if (m_running) {
- error("Client already started");
- return;
- }
- if (m_services.size() != SERVICES) {
- error("Client started with unexpected number of injected services: %s", m_services);
- return;
- }
- m_firstStartStackTrace = new Exception("First start stacktrace");
- info("client starting");
-
- m_thread = new Thread(this, "Client");
- m_thread.setDaemon(true);
- m_running = true;
- m_thread.start();
- }
-
- public void run() {
- m_started.step();
- while (m_running) {
- for (int i = 0; i < INVOKES; i++) {
- for (Map.Entry<String, S> e : m_services.entrySet()) {
- e.getValue().invoke(Integer.MAX_VALUE); // We are on the top of the aspect list
- }
- }
- }
- }
-
- public synchronized void stop() {
- if (!m_running) {
- error("client can't be stopped (not running)");
- Thread.dumpStack();
- return;
- }
-
- info("stopping client");
- m_running = false;
- try {
- m_thread.join();
- }
- catch (InterruptedException e) {
- error("interrupted while stopping client", e);
- }
- info("client stopped");
- m_firstStartStackTrace = null;
- m_stopped.step();
- }
- }
-
- public class SAspect implements S {
- volatile S m_next;
- final String m_name;
- final int m_rank;
- final Ensure m_invoked;
- volatile Dictionary<String, String> m_conf;
-
- SAspect(Ensure invoked, String name, int rank) {
- m_invoked = invoked;
- m_name = name;
- m_rank = rank;
- }
-
- public void updated(Dictionary<String, String> conf) {
- if (conf == null) {
- info("Aspect %s injected with a null configuration", this);
- return;
- }
- debug("Aspect %s injected with configuration: %s", this, conf);
- m_conf = conf;
- }
-
- public void start() {
- info("started aspect %s", this);
- }
-
- public void stop() {
- info("stopped aspect %s", this);
- }
-
- public void invoke(int prevRank) {
- Assert.assertTrue(prevRank > m_rank);
- if (m_conf == null) {
- error("Aspect: %s has not been injected with its configuration", this);
- return;
- }
-
- if (!m_name.equals(m_conf.get("name"))) {
- error("Aspect %s has not been injected with expected configuration: %s", this, m_conf);
- return;
- }
- m_invoked.step();
- m_next.invoke(m_rank);
- }
-
- public String toString() {
- return m_name;
- }
- }
-}