From 08269ac33356663d75f0df8cc54936eac5553e7b Mon Sep 17 00:00:00 2001 From: Tomas Cere Date: Mon, 12 Jun 2017 14:47:53 +0200 Subject: [PATCH] BUG 8649: remove bounded mailbox from ShardManager and notification actors Change-Id: I52975d969a81cc3ccdc7b963e0f43f9958ba6a10 Signed-off-by: Tomas Cere (cherry picked from commit 8a298158f0164f581f6d47ae505c76a2cb7e3771) --- .../controller/cluster/datastore/AbstractDataStore.java | 3 +-- .../AbstractShardDataTreeNotificationPublisherActorProxy.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractDataStore.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractDataStore.java index 03b403a13c..477e05bcc6 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractDataStore.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractDataStore.java @@ -283,8 +283,7 @@ public abstract class AbstractDataStore implements DistributedDataStoreInterface for (int i = 0; i < 100; i++) { try { - return actorSystem.actorOf(creator.props().withDispatcher(shardDispatcher).withMailbox( - ActorContext.BOUNDED_MAILBOX), shardManagerId); + return actorSystem.actorOf(creator.props().withDispatcher(shardDispatcher), shardManagerId); } catch (Exception e) { lastException = e; Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractShardDataTreeNotificationPublisherActorProxy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractShardDataTreeNotificationPublisherActorProxy.java index 1780bb78b3..858ee0f822 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractShardDataTreeNotificationPublisherActorProxy.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractShardDataTreeNotificationPublisherActorProxy.java @@ -58,8 +58,7 @@ abstract class AbstractShardDataTreeNotificationPublisherActorProxy implements S if (publisherActor == null) { String dispatcher = new Dispatchers(actorContext.system().dispatchers()).getDispatcherPath( Dispatchers.DispatcherType.Notification); - publisherActor = actorContext.actorOf(props().withDispatcher(dispatcher).withMailbox( - org.opendaylight.controller.cluster.datastore.utils.ActorContext.BOUNDED_MAILBOX), actorName); + publisherActor = actorContext.actorOf(props().withDispatcher(dispatcher), actorName); log.debug("{}: Created publisher actor {} with name {}", logContext, publisherActor, actorName); } -- 2.36.6