From d65a77b0a3dc7a10952b1e1ecf2ee69c925530bb Mon Sep 17 00:00:00 2001 From: Jakub Morvay Date: Wed, 8 Mar 2017 18:32:43 +0100 Subject: [PATCH] BUG-2138: Use correct actor context in shard lookup. Typo since we cannot have all lookups being routed into config. Change-Id:I708787d7e5e6136b6a22d6f402071702a6de412b Signed-off-by: Tomas Cere Signed-off-by: Jakub Morvay --- .../controller/cluster/sharding/ShardedDataTreeActor.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardedDataTreeActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardedDataTreeActor.java index 04a75628b7..e8f3f70860 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardedDataTreeActor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardedDataTreeActor.java @@ -67,6 +67,7 @@ import org.opendaylight.controller.cluster.sharding.messages.PrefixShardRemoved; import org.opendaylight.controller.cluster.sharding.messages.ProducerCreated; import org.opendaylight.controller.cluster.sharding.messages.ProducerRemoved; import org.opendaylight.controller.cluster.sharding.messages.RemovePrefixShard; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; import org.opendaylight.mdsal.dom.api.DOMDataTreeProducer; import org.opendaylight.mdsal.dom.api.DOMDataTreeProducerException; @@ -378,10 +379,14 @@ public class ShardedDataTreeActor extends AbstractUntypedPersistentActor { replicator.tell(update, self()); + final ActorContext context = + configuration.getPrefix().getDatastoreType() == LogicalDatastoreType.CONFIGURATION + ? distributedConfigDatastore.getActorContext() : distributedOperDatastore.getActorContext(); + // schedule a notification task for the reply actorSystem.scheduler().scheduleOnce(SHARD_LOOKUP_TASK_INTERVAL, new ShardCreationLookupTask(actorSystem, getSender(), clusterWrapper, - actorContext, shardingService, configuration.getPrefix()), + context, shardingService, configuration.getPrefix()), actorSystem.dispatcher()); } -- 2.36.6