X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2FTestActorFactory.java;h=96f4fe8c6e5172126291ed7358526b403d4a25f2;hb=88a7f904602133bb803752848bb58c9b0a3e9792;hp=b47df13fed8c97297abf66c68bc837a03988dfb9;hpb=ea3673e89598b896c93ebee864e6cb8db7f6c6ec;p=controller.git
diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/TestActorFactory.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/TestActorFactory.java
index b47df13fed..96f4fe8c6e 100644
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/TestActorFactory.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/TestActorFactory.java
@@ -5,32 +5,38 @@
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.controller.cluster.raft;
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
+import static org.junit.Assert.assertTrue;
import akka.actor.Actor;
+import akka.actor.ActorIdentity;
import akka.actor.ActorRef;
+import akka.actor.ActorSelection;
import akka.actor.ActorSystem;
+import akka.actor.Identify;
+import akka.actor.InvalidActorNameException;
import akka.actor.PoisonPill;
import akka.actor.Props;
-import akka.testkit.JavaTestKit;
+import akka.pattern.Patterns;
import akka.testkit.TestActorRef;
-import java.util.LinkedList;
+import akka.testkit.javadsl.TestKit;
+import akka.util.Timeout;
+import com.google.common.base.Stopwatch;
+import com.google.common.util.concurrent.Uninterruptibles;
+import java.time.Duration;
+import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import scala.concurrent.Await;
+import scala.concurrent.Future;
/**
* TestActorFactory provides methods to create both normal and test actors and to kill them when the factory is closed
- * The ideal usage for TestActorFactory is with try with resources,
+ * The ideal usage for TestActorFactory is with try with resources.
+ *
*/
public class TestActorFactory implements AutoCloseable {
+ private static final Logger LOG = LoggerFactory.getLogger(TestActorFactory.class);
+
private final ActorSystem system;
- List createdActors = new LinkedList<>();
- Logger LOG = LoggerFactory.getLogger(getClass());
+ private final List createdActors = new ArrayList<>();
private static int actorCount = 1;
- public TestActorFactory(ActorSystem system){
+ public TestActorFactory(final ActorSystem system) {
this.system = system;
}
/**
- * Create a normal actor with an auto-generated name
+ * Create a normal actor with an auto-generated name.
*
- * @param props
- * @return
+ * @param props the actor Props
+ * @return the ActorRef
*/
- public ActorRef createActor(Props props){
+ public ActorRef createActor(final Props props) {
ActorRef actorRef = system.actorOf(props);
- createdActors.add(actorRef);
- return actorRef;
+ return addActor(actorRef, true);
}
/**
- * Create a normal actor with the passed in name
- * @param props
+ * Create a normal actor with the passed in name.
+ *
+ * @param props the actor Props
* @param actorId name of actor
- * @return
+ * @return the ActorRef
*/
- public ActorRef createActor(Props props, String actorId){
+ public ActorRef createActor(final Props props, final String actorId) {
ActorRef actorRef = system.actorOf(props, actorId);
- createdActors.add(actorRef);
- return actorRef;
+ return addActor(actorRef, true);
}
/**
- * Create a test actor with the passed in name
- * @param props
- * @param actorId
- * @param
- * @return
+ * Create a normal actor with the passed in name w/o verifying that the actor is ready.
+ *
+ * @param props the actor Props
+ * @param actorId name of actor
+ * @return the ActorRef
*/
- public TestActorRef createTestActor(Props props, String actorId){
- TestActorRef actorRef = TestActorRef.create(system, props, actorId);
- createdActors.add(actorRef);
- return actorRef;
+ public ActorRef createActorNoVerify(final Props props, final String actorId) {
+ ActorRef actorRef = system.actorOf(props, actorId);
+ return addActor(actorRef, false);
}
/**
- * Create a test actor with an auto-generated name
- * @param props
- * @param
- * @return
+ * Create a test actor with the passed in name.
+ *
+ * @param props the actor Props
+ * @param actorId name of actor
+ * @param the actor type
+ * @return the ActorRef
*/
- public TestActorRef createTestActor(Props props){
+ @SuppressWarnings("unchecked")
+ public TestActorRef createTestActor(final Props props, final String actorId) {
+ InvalidActorNameException lastError = null;
+ for (int i = 0; i < 10; i++) {
+ try {
+ TestActorRef actorRef = TestActorRef.create(system, props, actorId);
+ return (TestActorRef) addActor(actorRef, true);
+ } catch (InvalidActorNameException e) {
+ lastError = e;
+ Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
+ }
+ }
+
+ throw lastError;
+ }
+
+ /**
+ * Create a test actor with an auto-generated name.
+ *
+ * @param props the actor Props
+ * @param the actor type
+ * @return the TestActorRef
+ */
+ @SuppressWarnings("unchecked")
+ public TestActorRef createTestActor(final Props props) {
TestActorRef actorRef = TestActorRef.create(system, props);
+ return (TestActorRef) addActor(actorRef, true);
+ }
+
+ private ActorRef addActor(final T actorRef, final boolean verify) {
createdActors.add(actorRef);
+ if (verify) {
+ verifyActorReady(actorRef);
+ }
+
return actorRef;
}
+ @SuppressWarnings("checkstyle:IllegalCatch")
+ private void verifyActorReady(final ActorRef actorRef) {
+ // Sometimes we see messages go to dead letters soon after creation - it seems the actor isn't quite
+ // in a state yet to receive messages or isn't actually created yet. This seems to happen with
+ // actorSelection so, to alleviate it, we use an actorSelection and send an Identify message with
+ // retries to ensure it's ready.
+
+ Timeout timeout = new Timeout(100, TimeUnit.MILLISECONDS);
+ Throwable lastError = null;
+ Stopwatch sw = Stopwatch.createStarted();
+ while (sw.elapsed(TimeUnit.SECONDS) <= 10) {
+ try {
+ ActorSelection actorSelection = system.actorSelection(actorRef.path().toString());
+ Future