X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fsharding%2FDistributedShardedDOMDataTreeRemotingTest.java;h=749d69987d70218dc57f6842c4266256fd9a88e5;hb=da174be7e22b16d4ac80cccefdc52b209b700745;hp=a3c04bdd4b6f40dae6b41312d4e3b71001686289;hpb=aea716f562ae010af4687812fab27af03f8a2a26;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeRemotingTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeRemotingTest.java index a3c04bdd4b..749d69987d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeRemotingTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeRemotingTest.java @@ -41,7 +41,6 @@ import org.opendaylight.controller.cluster.datastore.IntegrationTestKit; import org.opendaylight.controller.cluster.datastore.utils.ClusterUtils; import org.opendaylight.controller.cluster.raft.utils.InMemoryJournal; import org.opendaylight.controller.cluster.raft.utils.InMemorySnapshotStore; -import org.opendaylight.controller.cluster.sharding.DistributedShardFactory.DistributedShardRegistration; import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; @@ -56,6 +55,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLe import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@Deprecated(forRemoval = true) public class DistributedShardedDOMDataTreeRemotingTest extends AbstractTest { private static final Logger LOG = LoggerFactory.getLogger(DistributedShardedDOMDataTreeRemotingTest.class); @@ -128,8 +128,8 @@ public class DistributedShardedDOMDataTreeRemotingTest extends AbstractTest { followerOperDatastore.close(); } - TestKit.shutdownActorSystem(leaderSystem, Boolean.TRUE); - TestKit.shutdownActorSystem(followerSystem, Boolean.TRUE); + TestKit.shutdownActorSystem(leaderSystem, true); + TestKit.shutdownActorSystem(followerSystem, true); InMemoryJournal.clear(); InMemorySnapshotStore.clear(); @@ -170,11 +170,11 @@ public class DistributedShardedDOMDataTreeRemotingTest extends AbstractTest { LOG.info("Initializing leader DistributedShardedDOMDataTree"); leaderShardFactory.init(); - leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorContext(), - ClusterUtils.getCleanShardName(YangInstanceIdentifier.EMPTY)); + leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorUtils(), + ClusterUtils.getCleanShardName(YangInstanceIdentifier.empty())); - leaderTestKit.waitUntilLeader(leaderOperDatastore.getActorContext(), - ClusterUtils.getCleanShardName(YangInstanceIdentifier.EMPTY)); + leaderTestKit.waitUntilLeader(leaderOperDatastore.getActorUtils(), + ClusterUtils.getCleanShardName(YangInstanceIdentifier.empty())); LOG.info("Initializing follower DistributedShardedDOMDataTree"); followerShardFactory.init(); @@ -193,15 +193,15 @@ public class DistributedShardedDOMDataTreeRemotingTest extends AbstractTest { TEST_ID, Lists.newArrayList(AbstractTest.MEMBER_NAME, AbstractTest.MEMBER_2_NAME)), DistributedShardedDOMDataTree.SHARD_FUTURE_TIMEOUT_DURATION); - leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorContext(), + leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TEST_ID.getRootIdentifier())); - final ActorRef leaderShardManager = leaderConfigDatastore.getActorContext().getShardManager(); + final ActorRef leaderShardManager = leaderConfigDatastore.getActorUtils().getShardManager(); - assertNotNull(findLocalShard(leaderConfigDatastore.getActorContext(), + assertNotNull(findLocalShard(leaderConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TEST_ID.getRootIdentifier()))); - assertNotNull(findLocalShard(followerConfigDatastore.getActorContext(), + assertNotNull(findLocalShard(followerConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TEST_ID.getRootIdentifier()))); final Set peers = new HashSet<>(); @@ -259,9 +259,9 @@ public class DistributedShardedDOMDataTreeRemotingTest extends AbstractTest { DistributedShardedDOMDataTree.SHARD_FUTURE_TIMEOUT_DURATION); - leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorContext(), + leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TEST_ID.getRootIdentifier())); - findLocalShard(followerConfigDatastore.getActorContext(), + findLocalShard(followerConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TEST_ID.getRootIdentifier())); final Set peers = new HashSet<>(); @@ -316,39 +316,39 @@ public class DistributedShardedDOMDataTreeRemotingTest extends AbstractTest { Lists.newArrayList(AbstractTest.MEMBER_NAME, AbstractTest.MEMBER_2_NAME)), DistributedShardedDOMDataTree.SHARD_FUTURE_TIMEOUT_DURATION); - leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorContext(), + leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.TEST_PATH)); - leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorContext(), + leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.OUTER_CONTAINER_PATH)); - leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorContext(), + leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.INNER_LIST_PATH)); - leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorContext(), + leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.JUNK_PATH)); // check leader has local shards - assertNotNull(findLocalShard(leaderConfigDatastore.getActorContext(), + assertNotNull(findLocalShard(leaderConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.TEST_PATH))); - assertNotNull(findLocalShard(leaderConfigDatastore.getActorContext(), + assertNotNull(findLocalShard(leaderConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.OUTER_CONTAINER_PATH))); - assertNotNull(findLocalShard(leaderConfigDatastore.getActorContext(), + assertNotNull(findLocalShard(leaderConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.INNER_LIST_PATH))); - assertNotNull(findLocalShard(leaderConfigDatastore.getActorContext(), + assertNotNull(findLocalShard(leaderConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.JUNK_PATH))); // check follower has local shards - assertNotNull(findLocalShard(followerConfigDatastore.getActorContext(), + assertNotNull(findLocalShard(followerConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.TEST_PATH))); - assertNotNull(findLocalShard(followerConfigDatastore.getActorContext(), + assertNotNull(findLocalShard(followerConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.OUTER_CONTAINER_PATH))); - assertNotNull(findLocalShard(followerConfigDatastore.getActorContext(), + assertNotNull(findLocalShard(followerConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.INNER_LIST_PATH))); - assertNotNull(findLocalShard(followerConfigDatastore.getActorContext(), + assertNotNull(findLocalShard(followerConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.JUNK_PATH))); LOG.debug("Closing registrations"); @@ -358,30 +358,30 @@ public class DistributedShardedDOMDataTreeRemotingTest extends AbstractTest { reg3.close().toCompletableFuture().get(); reg4.close().toCompletableFuture().get(); - waitUntilShardIsDown(leaderConfigDatastore.getActorContext(), + waitUntilShardIsDown(leaderConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.TEST_PATH)); - waitUntilShardIsDown(leaderConfigDatastore.getActorContext(), + waitUntilShardIsDown(leaderConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.OUTER_CONTAINER_PATH)); - waitUntilShardIsDown(leaderConfigDatastore.getActorContext(), + waitUntilShardIsDown(leaderConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.INNER_LIST_PATH)); - waitUntilShardIsDown(leaderConfigDatastore.getActorContext(), + waitUntilShardIsDown(leaderConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.JUNK_PATH)); LOG.debug("All leader shards gone"); - waitUntilShardIsDown(followerConfigDatastore.getActorContext(), + waitUntilShardIsDown(followerConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.TEST_PATH)); - waitUntilShardIsDown(followerConfigDatastore.getActorContext(), + waitUntilShardIsDown(followerConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.OUTER_CONTAINER_PATH)); - waitUntilShardIsDown(followerConfigDatastore.getActorContext(), + waitUntilShardIsDown(followerConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.INNER_LIST_PATH)); - waitUntilShardIsDown(followerConfigDatastore.getActorContext(), + waitUntilShardIsDown(followerConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.JUNK_PATH)); LOG.debug("All follower shards gone"); @@ -399,13 +399,13 @@ public class DistributedShardedDOMDataTreeRemotingTest extends AbstractTest { TEST_ID, Lists.newArrayList(AbstractTest.MEMBER_NAME, AbstractTest.MEMBER_2_NAME)), DistributedShardedDOMDataTree.SHARD_FUTURE_TIMEOUT_DURATION); - leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorContext(), + leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.TEST_PATH)); - assertNotNull(findLocalShard(leaderConfigDatastore.getActorContext(), + assertNotNull(findLocalShard(leaderConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.TEST_PATH))); - assertNotNull(findLocalShard(followerConfigDatastore.getActorContext(), + assertNotNull(findLocalShard(followerConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.TEST_PATH))); @@ -417,10 +417,10 @@ public class DistributedShardedDOMDataTreeRemotingTest extends AbstractTest { waitOnAsyncTask(reg1.close(), DistributedShardedDOMDataTree.SHARD_FUTURE_TIMEOUT_DURATION); - waitUntilShardIsDown(leaderConfigDatastore.getActorContext(), + waitUntilShardIsDown(leaderConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.TEST_PATH)); - waitUntilShardIsDown(followerConfigDatastore.getActorContext(), + waitUntilShardIsDown(followerConfigDatastore.getActorUtils(), ClusterUtils.getCleanShardName(TestModel.TEST_PATH)); }