X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2Fregistry%2FRpcRegistryTest.java;h=5b7b7e4fdc61dfaaa2377078853b691b48b07394;hp=da3942a828182ff3e253e7c6ffcca2f99fdeb8b6;hb=c083d5c6ef874e38eebca402105e740f3614d6f7;hpb=886fe1a50077d9dc9c4c36f938fc7c86317cb149 diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistryTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistryTest.java index da3942a828..5b7b7e4fdc 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistryTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistryTest.java @@ -1,39 +1,44 @@ package org.opendaylight.controller.remote.rpc.registry; -import akka.actor.ActorPath; import akka.actor.ActorRef; -import akka.actor.ActorSelection; import akka.actor.ActorSystem; -import akka.actor.ChildActorPath; +import akka.actor.Address; import akka.actor.Props; import akka.japi.Pair; import akka.testkit.JavaTestKit; -import com.typesafe.config.ConfigFactory; +import com.google.common.util.concurrent.Uninterruptibles; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.opendaylight.controller.remote.rpc.RemoteRpcProviderConfig; import org.opendaylight.controller.remote.rpc.RouteIdentifierImpl; +import org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.AddOrUpdateRoutes; +import org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.FindRouters; +import org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.FindRoutersReply; +import org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.RemoveRoutes; +import org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.SetLocalRouter; +import org.opendaylight.controller.remote.rpc.registry.gossip.Bucket; +import org.opendaylight.controller.remote.rpc.registry.gossip.Messages.BucketStoreMessages.GetAllBuckets; +import org.opendaylight.controller.remote.rpc.registry.gossip.Messages.BucketStoreMessages.GetAllBucketsReply; +import org.opendaylight.controller.remote.rpc.registry.gossip.Messages.BucketStoreMessages.GetBucketVersions; +import org.opendaylight.controller.remote.rpc.registry.gossip.Messages.BucketStoreMessages.GetBucketVersionsReply; import org.opendaylight.controller.sal.connector.api.RpcRouter; +import org.opendaylight.controller.sal.connector.api.RpcRouter.RouteIdentifier; import org.opendaylight.yangtools.yang.common.QName; -import scala.concurrent.Await; -import scala.concurrent.Future; +import scala.concurrent.duration.Duration; import scala.concurrent.duration.FiniteDuration; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.TimeUnit; - -import static org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.AddOrUpdateRoutes; -import static org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.RemoveRoutes; -import static org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.FindRouters; -import static org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.FindRoutersReply; -import static org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.SetLocalRouter; - public class RpcRegistryTest { private static ActorSystem node1; @@ -44,239 +49,297 @@ public class RpcRegistryTest { private ActorRef registry2; private ActorRef registry3; + private int routeIdCounter = 1; + @BeforeClass - public static void setup() throws InterruptedException { - Thread.sleep(1000); //give some time for previous test to close netty ports - node1 = ActorSystem.create("opendaylight-rpc", ConfigFactory.load().getConfig("memberA")); - node2 = ActorSystem.create("opendaylight-rpc", ConfigFactory.load().getConfig("memberB")); - node3 = ActorSystem.create("opendaylight-rpc", ConfigFactory.load().getConfig("memberC")); + public static void staticSetup() throws InterruptedException { + RemoteRpcProviderConfig config1 = new RemoteRpcProviderConfig.Builder("memberA").build(); + RemoteRpcProviderConfig config2 = new RemoteRpcProviderConfig.Builder("memberB").build(); + RemoteRpcProviderConfig config3 = new RemoteRpcProviderConfig.Builder("memberC").build(); + node1 = ActorSystem.create("opendaylight-rpc", config1.get()); + node2 = ActorSystem.create("opendaylight-rpc", config2.get()); + node3 = ActorSystem.create("opendaylight-rpc", config3.get()); } @AfterClass - public static void teardown(){ - JavaTestKit.shutdownActorSystem(node1); - JavaTestKit.shutdownActorSystem(node2); - JavaTestKit.shutdownActorSystem(node3); - if (node1 != null) - node1.shutdown(); - if (node2 != null) - node2.shutdown(); - if (node3 != null) - node3.shutdown(); - + public static void staticTeardown() { + JavaTestKit.shutdownActorSystem(node1); + JavaTestKit.shutdownActorSystem(node2); + JavaTestKit.shutdownActorSystem(node3); } @Before - public void createRpcRegistry() throws InterruptedException { + public void setup() { registry1 = node1.actorOf(Props.create(RpcRegistry.class)); registry2 = node2.actorOf(Props.create(RpcRegistry.class)); registry3 = node3.actorOf(Props.create(RpcRegistry.class)); } @After - public void stopRpcRegistry() throws InterruptedException { - if (registry1 != null) + public void teardown() { + if (registry1 != null) { node1.stop(registry1); - if (registry2 != null) + } + if (registry2 != null) { node2.stop(registry2); - if (registry3 != null) + } + if (registry3 != null) { node3.stop(registry3); + } } /** - * One node cluster. - * 1. Register rpc, ensure router can be found - * 2. Then remove rpc, ensure its deleted + * One node cluster. 1. Register rpc, ensure router can be found 2. Then remove rpc, ensure its + * deleted * * @throws URISyntaxException * @throws InterruptedException */ @Test - public void testAddRemoveRpcOnSameNode() throws URISyntaxException, InterruptedException { + public void testAddRemoveRpcOnSameNode() throws Exception { + + System.out.println("testAddRemoveRpcOnSameNode starting"); final JavaTestKit mockBroker = new JavaTestKit(node1); - //Add rpc on node 1 + Address nodeAddress = node1.provider().getDefaultAddress(); + + // Add rpc on node 1 registry1.tell(new SetLocalRouter(mockBroker.getRef()), mockBroker.getRef()); - registry1.tell(getAddRouteMessage(), mockBroker.getRef()); - Thread.sleep(1000);// + List> addedRouteIds = createRouteIds(); + + registry1.tell(new AddOrUpdateRoutes(addedRouteIds), mockBroker.getRef()); + + // Bucket store should get an update bucket message. Updated bucket contains added rpc. + + Map buckets = retrieveBuckets(registry1, mockBroker, nodeAddress); + verifyBucket(buckets.get(nodeAddress), addedRouteIds); + + Map versions = retrieveVersions(registry1, mockBroker); + Assert.assertEquals("Version for bucket " + nodeAddress, buckets.get(nodeAddress).getVersion(), + versions.get(nodeAddress)); - //find the route on node 1's registry - registry1.tell(new FindRouters(createRouteId()), mockBroker.getRef()); - FindRoutersReply message = mockBroker.expectMsgClass(JavaTestKit.duration("10 second"), FindRoutersReply.class); - List> pairs = message.getRouterWithUpdateTime(); + // Now remove rpc + registry1.tell(new RemoveRoutes(addedRouteIds), mockBroker.getRef()); - validateRouterReceived(pairs, mockBroker.getRef()); + // Bucket store should get an update bucket message. Rpc is removed in the updated bucket - //Now remove rpc - registry1.tell(getRemoveRouteMessage(), mockBroker.getRef()); - Thread.sleep(1000); - //find the route on node 1's registry - registry1.tell(new FindRouters(createRouteId()), mockBroker.getRef()); - message = mockBroker.expectMsgClass(JavaTestKit.duration("10 second"), FindRoutersReply.class); - pairs = message.getRouterWithUpdateTime(); + verifyEmptyBucket(mockBroker, registry1, nodeAddress); + + System.out.println("testAddRemoveRpcOnSameNode ending"); - Assert.assertTrue(pairs.isEmpty()); } /** - * Three node cluster. - * 1. Register rpc on 1 node, ensure its router can be found on other 2. - * 2. Remove rpc on 1 node, ensure its removed on other 2. + * Three node cluster. 1. Register rpc on 1 node, ensure 2nd node gets updated 2. Remove rpc on + * 1 node, ensure 2nd node gets updated * * @throws URISyntaxException * @throws InterruptedException */ @Test - public void testRpcAddRemoveInCluster() throws URISyntaxException, InterruptedException { + public void testRpcAddRemoveInCluster() throws Exception { - validateSystemStartup(); + System.out.println("testRpcAddRemoveInCluster starting"); final JavaTestKit mockBroker1 = new JavaTestKit(node1); final JavaTestKit mockBroker2 = new JavaTestKit(node2); - final JavaTestKit mockBroker3 = new JavaTestKit(node3); - //Add rpc on node 1 + List> addedRouteIds = createRouteIds(); + + Address node1Address = node1.provider().getDefaultAddress(); + + // Add rpc on node 1 registry1.tell(new SetLocalRouter(mockBroker1.getRef()), mockBroker1.getRef()); - registry1.tell(getAddRouteMessage(), mockBroker1.getRef()); + registry1.tell(new AddOrUpdateRoutes(addedRouteIds), mockBroker1.getRef()); - Thread.sleep(1000);// give some time for bucket store data sync + // Bucket store on node2 should get a message to update its local copy of remote buckets - //find the route in node 2's registry - List> pairs = findRouters(registry2, mockBroker2); - validateRouterReceived(pairs, mockBroker1.getRef()); + Map buckets = retrieveBuckets(registry2, mockBroker2, node1Address); + verifyBucket(buckets.get(node1Address), addedRouteIds); - //find the route in node 3's registry - pairs = findRouters(registry3, mockBroker3); - validateRouterReceived(pairs, mockBroker1.getRef()); + // Now remove + registry1.tell(new RemoveRoutes(addedRouteIds), mockBroker1.getRef()); - //Now remove - registry1.tell(getRemoveRouteMessage(), mockBroker1.getRef()); - Thread.sleep(1000);// give some time for bucket store data sync + // Bucket store on node2 should get a message to update its local copy of remote buckets. + // Wait for the bucket for node1 to be empty. + + verifyEmptyBucket(mockBroker2, registry2, node1Address); + + System.out.println("testRpcAddRemoveInCluster ending"); + } - pairs = findRouters(registry2, mockBroker2); - Assert.assertTrue(pairs.isEmpty()); + private void verifyEmptyBucket(JavaTestKit testKit, ActorRef registry, Address address) + throws AssertionError { + Map buckets; + int nTries = 0; + while(true) { + buckets = retrieveBuckets(registry1, testKit, address); + + try { + verifyBucket(buckets.get(address), Collections.>emptyList()); + break; + } catch (AssertionError e) { + if(++nTries >= 50) { + throw e; + } + } - pairs = findRouters(registry3, mockBroker3); - Assert.assertTrue(pairs.isEmpty()); + Uninterruptibles.sleepUninterruptibly(200, TimeUnit.MILLISECONDS); + } } /** - * Three node cluster. - * Register rpc on 2 nodes. Ensure 2 routers are found on 3rd. + * Three node cluster. Register rpc on 2 nodes. Ensure 3rd gets updated. * * @throws Exception */ @Test - public void testAnRpcAddedOnMultiNodesShouldReturnMultiRouter() throws Exception { - - validateSystemStartup(); + public void testRpcAddedOnMultiNodes() throws Exception { final JavaTestKit mockBroker1 = new JavaTestKit(node1); final JavaTestKit mockBroker2 = new JavaTestKit(node2); final JavaTestKit mockBroker3 = new JavaTestKit(node3); - //Thread.sleep(5000);//let system come up + registry3.tell(new SetLocalRouter(mockBroker3.getRef()), mockBroker3.getRef()); - //Add rpc on node 1 + // Add rpc on node 1 + List> addedRouteIds1 = createRouteIds(); registry1.tell(new SetLocalRouter(mockBroker1.getRef()), mockBroker1.getRef()); - registry1.tell(getAddRouteMessage(), mockBroker1.getRef()); + registry1.tell(new AddOrUpdateRoutes(addedRouteIds1), mockBroker1.getRef()); - //Add same rpc on node 2 + // Add rpc on node 2 + List> addedRouteIds2 = createRouteIds(); registry2.tell(new SetLocalRouter(mockBroker2.getRef()), mockBroker2.getRef()); - registry2.tell(getAddRouteMessage(), mockBroker2.getRef()); + registry2.tell(new AddOrUpdateRoutes(addedRouteIds2), mockBroker2.getRef()); - registry3.tell(new SetLocalRouter(mockBroker3.getRef()), mockBroker3.getRef()); - Thread.sleep(1000);// give some time for bucket store data sync + Address node1Address = node1.provider().getDefaultAddress(); + Address node2Address = node2.provider().getDefaultAddress(); - //find the route in node 3's registry - registry3.tell(new FindRouters(createRouteId()), mockBroker3.getRef()); - FindRoutersReply message = mockBroker3.expectMsgClass(JavaTestKit.duration("10 second"), FindRoutersReply.class); - List> pairs = message.getRouterWithUpdateTime(); + Map buckets = retrieveBuckets(registry3, mockBroker3, node1Address, + node2Address); - validateMultiRouterReceived(pairs, mockBroker1.getRef(), mockBroker2.getRef()); + verifyBucket(buckets.get(node1Address), addedRouteIds1); + verifyBucket(buckets.get(node2Address), addedRouteIds2); - } + Map versions = retrieveVersions(registry3, mockBroker3); + Assert.assertEquals("Version for bucket " + node1Address, buckets.get(node1Address).getVersion(), + versions.get(node1Address)); + Assert.assertEquals("Version for bucket " + node2Address, buckets.get(node2Address).getVersion(), + versions.get(node2Address)); - private List> findRouters(ActorRef registry, JavaTestKit receivingActor) throws URISyntaxException { - registry.tell(new FindRouters(createRouteId()), receivingActor.getRef()); - FindRoutersReply message = receivingActor.expectMsgClass(JavaTestKit.duration("10 second"), FindRoutersReply.class); - return message.getRouterWithUpdateTime(); - } + RouteIdentifier routeID = addedRouteIds1.get(0); + registry3.tell(new FindRouters(routeID), mockBroker3.getRef()); - private void validateMultiRouterReceived(List> actual, ActorRef... expected) { - Assert.assertTrue(actual != null); - Assert.assertTrue(actual.size() == expected.length); + FindRoutersReply reply = mockBroker3.expectMsgClass(Duration.create(3, TimeUnit.SECONDS), + FindRoutersReply.class); + + List> respList = reply.getRouterWithUpdateTime(); + Assert.assertEquals("getRouterWithUpdateTime size", 1, respList.size()); + + respList.get(0).first().tell("hello", ActorRef.noSender()); + mockBroker1.expectMsgEquals(Duration.create(3, TimeUnit.SECONDS), "hello"); } - private void validateRouterReceived(List> actual, ActorRef expected){ - Assert.assertTrue(actual != null); - Assert.assertTrue(actual.size() == 1); + private Map retrieveVersions(ActorRef bucketStore, JavaTestKit testKit) { + bucketStore.tell(new GetBucketVersions(), testKit.getRef()); + GetBucketVersionsReply reply = testKit.expectMsgClass(Duration.create(3, TimeUnit.SECONDS), + GetBucketVersionsReply.class); + return reply.getVersions(); + } - for (Pair pair : actual){ - Assert.assertTrue(expected.path().uid() == pair.first().path().uid()); + private void verifyBucket(Bucket bucket, List> expRouteIds) { + RoutingTable table = bucket.getData(); + Assert.assertNotNull("Bucket RoutingTable is null", table); + for(RouteIdentifier r: expRouteIds) { + if(!table.contains(r)) { + Assert.fail("RoutingTable does not contain " + r + ". Actual: " + table); + } } - } - private void validateSystemStartup() throws InterruptedException { + Assert.assertEquals("RoutingTable size", expRouteIds.size(), table.size()); + } - Thread.sleep(5000); - ActorPath gossiper1Path = new ChildActorPath(new ChildActorPath(registry1.path(), "store"), "gossiper"); - ActorPath gossiper2Path = new ChildActorPath(new ChildActorPath(registry2.path(), "store"), "gossiper"); - ActorPath gossiper3Path = new ChildActorPath(new ChildActorPath(registry3.path(), "store"), "gossiper"); + private Map retrieveBuckets(ActorRef bucketStore, JavaTestKit testKit, + Address... addresses) { + int nTries = 0; + while(true) { + bucketStore.tell(new GetAllBuckets(), testKit.getRef()); + GetAllBucketsReply reply = testKit.expectMsgClass(Duration.create(3, TimeUnit.SECONDS), + GetAllBucketsReply.class); + + Map buckets = reply.getBuckets(); + boolean foundAll = true; + for(Address addr: addresses) { + Bucket bucket = buckets.get(addr); + if(bucket == null) { + foundAll = false; + break; + } + } - ActorSelection gossiper1 = node1.actorSelection(gossiper1Path); - ActorSelection gossiper2 = node2.actorSelection(gossiper2Path); - ActorSelection gossiper3 = node3.actorSelection(gossiper3Path); + if(foundAll) { + return buckets; + } + if(++nTries >= 50) { + Assert.fail("Missing expected buckets for addresses: " + Arrays.toString(addresses) + + ", Actual: " + buckets); + } - if (!resolveReference(gossiper1, gossiper2, gossiper3)) - Assert.fail("Could not find gossipers"); + Uninterruptibles.sleepUninterruptibly(200, TimeUnit.MILLISECONDS); + } } - private Boolean resolveReference(ActorSelection... gossipers) throws InterruptedException { + @SuppressWarnings("unchecked") + @Test + public void testAddRoutesConcurrency() throws Exception { + final JavaTestKit testKit = new JavaTestKit(node1); + + registry1.tell(new SetLocalRouter(testKit.getRef()), ActorRef.noSender()); - Boolean resolved = true; + final int nRoutes = 500; + final RouteIdentifier[] added = new RouteIdentifier[nRoutes]; + for(int i = 0; i < nRoutes; i++) { + final RouteIdentifierImpl routeId = new RouteIdentifierImpl(null, + new QName(new URI("/mockrpc"), "type" + i), null); + added[i] = routeId; - for (int i=0; i< 5; i++) { - Thread.sleep(1000); - for (ActorSelection gossiper : gossipers) { - Future future = gossiper.resolveOne(new FiniteDuration(5000, TimeUnit.MILLISECONDS)); + //Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS); + registry1.tell(new AddOrUpdateRoutes(Arrays.>asList(routeId)), + ActorRef.noSender()); + } - ActorRef ref = null; - try { - ref = Await.result(future, new FiniteDuration(10000, TimeUnit.MILLISECONDS)); - } catch (Exception e) { - e.printStackTrace(); + GetAllBuckets getAllBuckets = new GetAllBuckets(); + FiniteDuration duration = Duration.create(3, TimeUnit.SECONDS); + int nTries = 0; + while(true) { + registry1.tell(getAllBuckets, testKit.getRef()); + GetAllBucketsReply reply = testKit.expectMsgClass(duration, GetAllBucketsReply.class); + + Bucket localBucket = reply.getBuckets().values().iterator().next(); + RoutingTable table = localBucket.getData(); + if(table != null && table.size() == nRoutes) { + for(RouteIdentifier r: added) { + Assert.assertEquals("RoutingTable contains " + r, true, table.contains(r)); } - if (ref == null) - resolved = false; + break; } - if (resolved) break; - } - return resolved; - } - - private AddOrUpdateRoutes getAddRouteMessage() throws URISyntaxException { - return new AddOrUpdateRoutes(createRouteIds()); - } + if(++nTries >= 50) { + Assert.fail("Expected # routes: " + nRoutes + ", Actual: " + table.size()); + } - private RemoveRoutes getRemoveRouteMessage() throws URISyntaxException { - return new RemoveRoutes(createRouteIds()); + Uninterruptibles.sleepUninterruptibly(200, TimeUnit.MILLISECONDS); + } } - private List> createRouteIds() throws URISyntaxException { - QName type = new QName(new URI("/mockrpc"), "mockrpc"); - List> routeIds = new ArrayList<>(); + private List> createRouteIds() throws URISyntaxException { + QName type = new QName(new URI("/mockrpc"), "mockrpc" + routeIdCounter++); + List> routeIds = new ArrayList<>(); routeIds.add(new RouteIdentifierImpl(null, type, null)); return routeIds; } - - private RpcRouter.RouteIdentifier createRouteId() throws URISyntaxException { - QName type = new QName(new URI("/mockrpc"), "mockrpc"); - return new RouteIdentifierImpl(null, type, null); - } -} \ No newline at end of file +}