X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FShardManager.java;h=aec94ec0805467be82c54efccfb6fb3603dd4c5d;hb=refs%2Fchanges%2F24%2F32524%2F19;hp=9823521e4722a7d77da5ea3b446c011fee53a4fa;hpb=600e07c2adb213b614cad127070f1e7ff074b42b;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java index 9823521e47..aec94ec080 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java @@ -259,14 +259,13 @@ public class ShardManager extends AbstractUntypedPersistentActorWithMetering { } private void onShutDown() { - Shutdown shutdown = new Shutdown(); List> stopFutures = new ArrayList<>(localShards.size()); for (ShardInformation info : localShards.values()) { if (info.getActor() != null) { LOG.debug("{}: Issuing gracefulStop to shard {}", persistenceId(), info.getShardId()); FiniteDuration duration = info.getDatastoreContext().getShardRaftConfig().getElectionTimeOutInterval().$times(2); - stopFutures.add(Patterns.gracefulStop(info.getActor(), duration, shutdown)); + stopFutures.add(Patterns.gracefulStop(info.getActor(), duration, Shutdown.INSTANCE)); } } @@ -385,7 +384,7 @@ public class ShardManager extends AbstractUntypedPersistentActorWithMetering { return; } else if(shardInformation.getActor() != null) { LOG.debug("{} : Sending Shutdown to Shard actor {}", persistenceId(), shardInformation.getActor()); - shardInformation.getActor().tell(new Shutdown(), self()); + shardInformation.getActor().tell(Shutdown.INSTANCE, self()); } LOG.debug("{} : Local Shard replica for shard {} has been removed", persistenceId(), shardId.getShardName()); persistShardList(); @@ -934,8 +933,8 @@ public class ShardManager extends AbstractUntypedPersistentActorWithMetering { continue; } - LOG.debug("{}: findPrimary for {} forwarding to remote ShardManager {}", persistenceId(), - shardName, address); + LOG.debug("{}: findPrimary for {} forwarding to remote ShardManager {}, visitedAddresses: {}", + persistenceId(), shardName, address, visitedAddresses); getContext().actorSelection(address).forward(new RemoteFindPrimary(shardName, message.isWaitUntilReady(), visitedAddresses), getContext()); @@ -1276,7 +1275,8 @@ public class ShardManager extends AbstractUntypedPersistentActorWithMetering { private void onSaveSnapshotSuccess (SaveSnapshotSuccess successMessage) { LOG.debug ("{} saved ShardManager snapshot successfully. Deleting the prev snapshot if available", persistenceId()); - deleteSnapshots(new SnapshotSelectionCriteria(scala.Long.MaxValue(), (successMessage.metadata().timestamp() - 1))); + deleteSnapshots(new SnapshotSelectionCriteria(scala.Long.MaxValue(), successMessage.metadata().timestamp() - 1, + 0, 0)); } private static class ForwardedAddServerReply {