X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FShardTestKit.java;h=b22ca277e507479ac86846c912f18e9f5d0615e9;hp=9a0e8f9e18416d104f059e316577d377e5c718f2;hb=3402cfce32b05957219e54754dd7ca5b0a54cd0e;hpb=54caaff453fc8da7f8f927323e6b97bed2f33d25

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTestKit.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTestKit.java
index 9a0e8f9e18..b22ca277e5 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTestKit.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTestKit.java
@@ -7,58 +7,95 @@
  */
 package org.opendaylight.controller.cluster.datastore;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import akka.actor.ActorRef;
+import akka.actor.ActorSystem;
+import akka.pattern.Patterns;
+import akka.testkit.javadsl.EventFilter;
+import akka.testkit.javadsl.TestKit;
+import akka.util.Timeout;
+import com.google.common.util.concurrent.Uninterruptibles;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
-import org.junit.Assert;
+import java.util.concurrent.TimeoutException;
 import org.opendaylight.controller.cluster.raft.client.messages.FindLeader;
 import org.opendaylight.controller.cluster.raft.client.messages.FindLeaderReply;
-import com.google.common.util.concurrent.Uninterruptibles;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import scala.concurrent.Await;
 import scala.concurrent.Future;
-import scala.concurrent.duration.Duration;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.pattern.Patterns;
-import akka.testkit.JavaTestKit;
-import akka.util.Timeout;
+import scala.concurrent.duration.FiniteDuration;
 
-class ShardTestKit extends JavaTestKit {
+public class ShardTestKit extends TestKit {
+    private static final Logger LOG = LoggerFactory.getLogger(ShardTestKit.class);
 
-    ShardTestKit(ActorSystem actorSystem) {
+    public ShardTestKit(final ActorSystem actorSystem) {
         super(actorSystem);
     }
 
-    protected void waitForLogMessage(final Class logLevel, ActorRef subject, String logMessage){
+    public void waitForLogMessage(final Class<?> logLevel, final ActorRef subject, final String logMessage) {
         // Wait for a specific log message to show up
-        final boolean result =
-            new JavaTestKit.EventFilter<Boolean>(logLevel
-            ) {
-                @Override
-                protected Boolean run() {
-                    return true;
+        final Boolean result = new EventFilter(logLevel, getSystem()).from(subject.path().toString())
+                .message(logMessage).occurrences(1).intercept(() -> Boolean.TRUE);
+        assertEquals(Boolean.TRUE, result);
+    }
+
+    @SuppressWarnings("checkstyle:IllegalCatch")
+    public static String waitUntilLeader(final ActorRef shard) {
+        FiniteDuration duration = FiniteDuration.create(100, TimeUnit.MILLISECONDS);
+        for (int i = 0; i < 20 * 5; i++) {
+            Future<Object> future = Patterns.ask(shard, FindLeader.INSTANCE, new Timeout(duration));
+            try {
+                final Optional<String> maybeLeader = ((FindLeaderReply) Await.result(future, duration))
+                        .getLeaderActor();
+                if (maybeLeader.isPresent()) {
+                    return maybeLeader.get();
                 }
-            }.from(subject.path().toString())
-                .message(logMessage)
-                .occurrences(1).exec();
+            } catch (TimeoutException e) {
+                LOG.trace("FindLeader timed out", e);
+            } catch (Exception e) {
+                LOG.error("FindLeader failed", e);
+            }
 
-        Assert.assertEquals(true, result);
+            Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS);
+        }
 
+        fail("Leader not found for shard " + shard.path());
+        return null;
     }
 
-    protected void waitUntilLeader(ActorRef shard) {
-        for(int i = 0; i < 20 * 5; i++) {
-            Future<Object> future = Patterns.ask(shard, new FindLeader(), new Timeout(5, TimeUnit.SECONDS));
+    @SuppressWarnings("checkstyle:IllegalCatch")
+    public void waitUntilNoLeader(final ActorRef shard) {
+        FiniteDuration duration = FiniteDuration.create(100, TimeUnit.MILLISECONDS);
+        Object lastResponse = null;
+        for (int i = 0; i < 20 * 5; i++) {
+            Future<Object> future = Patterns.ask(shard, FindLeader.INSTANCE, new Timeout(duration));
             try {
-                FindLeaderReply resp = (FindLeaderReply)Await.result(future, Duration.create(5, TimeUnit.SECONDS));
-                if(resp.getLeaderActor() != null) {
+                final Optional<String> maybeLeader = ((FindLeaderReply) Await.result(future, duration))
+                        .getLeaderActor();
+                if (!maybeLeader.isPresent()) {
                     return;
                 }
+
+                lastResponse = maybeLeader.get();
+            } catch (TimeoutException e) {
+                lastResponse = e;
             } catch (Exception e) {
-                e.printStackTrace();
+                LOG.error("FindLeader failed", e);
+                lastResponse = e;
             }
 
             Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS);
         }
 
-        Assert.fail("Leader not found for shard " + shard.path());
+        if (lastResponse instanceof Throwable) {
+            throw (AssertionError)new AssertionError(
+                    String.format("Unexpected error occurred from FindLeader for shard %s", shard.path()))
+                            .initCause((Throwable)lastResponse);
+        }
+
+        fail(String.format("Unexpected leader %s found for shard %s", lastResponse, shard.path()));
     }
-}
\ No newline at end of file
+}