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%2Fsharding%2FPrefixedShardConfigUpdateHandler.java;h=7dbdd290e69d9e6fa7be758c0d76b09387d78de2;hb=6a32d897d2dcb4fa54977b3b2defe76dc0a5d5e2;hp=f8ecdb804cbfba927637fdd99ada12e9e981bdf6;hpb=149feb98f151186975fe42bab5853e05aafd4b51;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigUpdateHandler.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigUpdateHandler.java
index f8ecdb804c..7dbdd290e6 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigUpdateHandler.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigUpdateHandler.java
@@ -19,7 +19,6 @@ import java.util.Collection;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
 import org.opendaylight.controller.cluster.access.concepts.MemberName;
 import org.opendaylight.controller.cluster.datastore.AbstractDataStore;
 import org.opendaylight.controller.cluster.datastore.config.PrefixShardConfiguration;
@@ -27,8 +26,9 @@ import org.opendaylight.controller.cluster.datastore.shardstrategy.PrefixShardSt
 import org.opendaylight.controller.cluster.datastore.utils.ClusterUtils;
 import org.opendaylight.controller.cluster.sharding.messages.PrefixShardCreated;
 import org.opendaylight.controller.cluster.sharding.messages.PrefixShardRemoved;
-import org.opendaylight.controller.md.sal.dom.api.ClusteredDOMDataTreeChangeListener;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.dom.api.ClusteredDOMDataTreeChangeListener;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
@@ -53,8 +53,7 @@ public class PrefixedShardConfigUpdateHandler {
     private final ActorRef handlingActor;
     private final MemberName memberName;
 
-    private final EnumMap<LogicalDatastoreType,
-            ListenerRegistration<org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeListener>> registrations =
+    private final EnumMap<LogicalDatastoreType,ListenerRegistration<DOMDataTreeChangeListener>> registrations =
             new EnumMap<>(LogicalDatastoreType.class);
 
     public PrefixedShardConfigUpdateHandler(final ActorRef handlingActor, final MemberName memberName) {
@@ -77,6 +76,7 @@ public class PrefixedShardConfigUpdateHandler {
         private final MemberName memberName;
         private final LogicalDatastoreType type;
         private final ActorRef handlingActor;
+        private final String logName;
 
         public ShardConfigHandler(final MemberName memberName,
                            final LogicalDatastoreType type,
@@ -84,10 +84,11 @@ public class PrefixedShardConfigUpdateHandler {
             this.memberName = memberName;
             this.type = type;
             this.handlingActor = handlingActor;
+            logName = memberName.getName() + "-" + type;
         }
 
         @Override
-        public void onDataTreeChanged(@Nonnull final Collection<DataTreeCandidate> changes) {
+        public void onDataTreeChanged(final Collection<DataTreeCandidate> changes) {
             changes.forEach(this::resolveChange);
         }
 
@@ -95,24 +96,22 @@ public class PrefixedShardConfigUpdateHandler {
             switch (candidate.getRootNode().getModificationType()) {
                 case UNMODIFIED:
                     break;
-                case SUBTREE_MODIFIED:
                 case APPEARED:
-                case WRITE:
-                    resolveWrite(candidate.getRootNode());
-                    break;
                 case DELETE:
                 case DISAPPEARED:
-                    resolveDelete(candidate.getRootNode());
+                case SUBTREE_MODIFIED:
+                case WRITE:
+                    resolveModifiedRoot(candidate.getRootNode());
                     break;
                 default:
                     break;
             }
         }
 
-        private void resolveWrite(final DataTreeCandidateNode rootNode) {
+        private void resolveModifiedRoot(final DataTreeCandidateNode rootNode) {
 
-            LOG.debug("{}: New config received {}", memberName, rootNode);
-            LOG.debug("{}: Data after: {}", memberName, rootNode.getDataAfter());
+            LOG.debug("{}: New config received {}", logName, rootNode);
+            LOG.debug("{}: Data after: {}", logName, rootNode.getDataAfter());
 
             // were in the shards list, iter children and resolve
             for (final DataTreeCandidateNode childNode : rootNode.getChildNodes()) {
@@ -134,6 +133,7 @@ public class PrefixedShardConfigUpdateHandler {
             }
         }
 
+        @SuppressWarnings("unchecked")
         private void resolveWrittenShard(final DataTreeCandidateNode childNode) {
             final MapEntryNode entryNode = (MapEntryNode) childNode.getDataAfter().get();
             final LeafNode<YangInstanceIdentifier> prefix =
@@ -141,7 +141,7 @@ public class PrefixedShardConfigUpdateHandler {
 
             final YangInstanceIdentifier identifier = prefix.getValue();
 
-            LOG.debug("{}: Deserialized {} from datastore", memberName, identifier);
+            LOG.debug("{}: Deserialized {} from datastore", logName, identifier);
 
             final ContainerNode replicas =
                     (ContainerNode) entryNode.getChild(new NodeIdentifier(SHARD_REPLICAS_QNAME)).get();
@@ -153,13 +153,13 @@ public class PrefixedShardConfigUpdateHandler {
                     .map(child -> MemberName.forName(child.getValue()))
                     .collect(Collectors.toList());
 
-            LOG.debug("{}: Replicas read from ds {}", memberName, retReplicas.toString());
+            LOG.debug("{}: Replicas read from ds {}", logName, retReplicas.toString());
 
             final PrefixShardConfiguration newConfig =
                     new PrefixShardConfiguration(new DOMDataTreeIdentifier(type, identifier),
                             PrefixShardStrategy.NAME, retReplicas);
 
-            LOG.debug("{}: Resulting config {}", memberName, newConfig);
+            LOG.debug("{}: Resulting config {} - sending PrefixShardCreated to {}", logName, newConfig, handlingActor);
 
             handlingActor.tell(new PrefixShardCreated(newConfig), noSender());
         }
@@ -180,8 +180,9 @@ public class PrefixedShardConfigUpdateHandler {
             handlingActor.tell(message, noSender());
         }
 
-        private void resolveDelete(final DataTreeCandidateNode rootNode) {
-
+        @Override
+        public String toString() {
+            return "ShardConfigHandler [logName=" + logName + ", handlingActor=" + handlingActor + "]";
         }
     }
 }