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%2Fentityownership%2FEntityOwnershipListenerSupport.java;h=e944325c69229ade6828dca233043c307b43f6eb;hb=a623206f49e3c376e1a8494ba584ea0018468f12;hp=ed4a004ed046b72fd83ef17a23dfc0552f8d1512;hpb=a4d9810d7211097f2803174d0c23a27b53dbc9d2;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipListenerSupport.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipListenerSupport.java
index ed4a004ed0..e944325c69 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipListenerSupport.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipListenerSupport.java
@@ -14,11 +14,12 @@ import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.Map;
-import org.opendaylight.controller.cluster.datastore.entityownership.messages.EntityOwnershipChanged;
+import java.util.Set;
 import org.opendaylight.controller.md.sal.common.api.clustering.Entity;
-import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipCandidate;
+import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipChange;
 import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,7 +35,7 @@ class EntityOwnershipListenerSupport {
     private final String logId;
     private final ActorContext actorContext;
     private final Map<EntityOwnershipListener, ListenerActorRefEntry> listenerActorMap = new IdentityHashMap<>();
-    private final Multimap<Entity, EntityOwnershipListener> entityListenerMap = HashMultimap.create();
+    private final Set<Entity> entitiesWithCandidateSet = new HashSet<>();
     private final Multimap<String, EntityOwnershipListener> entityTypeListenerMap = HashMultimap.create();
 
     EntityOwnershipListenerSupport(ActorContext actorContext, String logId) {
@@ -47,19 +48,15 @@ class EntityOwnershipListenerSupport {
     }
 
     boolean hasCandidateForEntity(Entity entity) {
-        for(EntityOwnershipListener listener: entityListenerMap.get(entity)) {
-            if(listener instanceof EntityOwnershipCandidate) {
-                return true;
-            }
-        }
-
-        return false;
+        return entitiesWithCandidateSet.contains(entity);
     }
 
-    void addEntityOwnershipListener(Entity entity, EntityOwnershipListener listener) {
-        LOG.debug("{}: Adding EntityOwnershipListener {} for {}", logId, listener, entity);
+    void setHasCandidateForEntity(Entity entity) {
+        entitiesWithCandidateSet.add(entity);
+    }
 
-        addListener(listener, entity, entityListenerMap);
+    void unsetHasCandidateForEntity(Entity entity) {
+        entitiesWithCandidateSet.remove(entity);
     }
 
     void addEntityOwnershipListener(String entityType, EntityOwnershipListener listener) {
@@ -68,39 +65,32 @@ class EntityOwnershipListenerSupport {
         addListener(listener, entityType, entityTypeListenerMap);
     }
 
-    void removeEntityOwnershipListener(Entity entity, EntityOwnershipListener listener) {
-        LOG.debug("{}: Removing EntityOwnershipListener {} for {}", logId, listener, entity);
-
-        removeListener(listener, entity, entityListenerMap);
-    }
-
     void removeEntityOwnershipListener(String entityType, EntityOwnershipListener listener) {
         LOG.debug("{}: Removing EntityOwnershipListener {} for entity type {}", logId, listener, entityType);
 
         removeListener(listener, entityType, entityTypeListenerMap);
     }
 
-    void notifyEntityOwnershipListeners(Entity entity, boolean wasOwner, boolean isOwner) {
-        notifyListeners(entity, entity, wasOwner, isOwner, entityListenerMap);
-        notifyListeners(entity, entity.getType(), wasOwner, isOwner, entityTypeListenerMap);
+    void notifyEntityOwnershipListeners(Entity entity, boolean wasOwner, boolean isOwner, boolean hasOwner) {
+        notifyListeners(entity, entity.getType(), wasOwner, isOwner, hasOwner, entityTypeListenerMap);
     }
 
-    void notifyEntityOwnershipListener(Entity entity, boolean wasOwner, boolean isOwner,
+    void notifyEntityOwnershipListener(Entity entity, boolean wasOwner, boolean isOwner, boolean hasOwner,
             EntityOwnershipListener listener) {
-        notifyListeners(entity, wasOwner, isOwner, Arrays.asList(listener));
+        notifyListeners(entity, wasOwner, isOwner, hasOwner, Arrays.asList(listener));
     }
 
-    private <T> void notifyListeners(Entity entity, T mapKey, boolean wasOwner, boolean isOwner,
+    private <T> void notifyListeners(Entity entity, T mapKey, boolean wasOwner, boolean isOwner, boolean hasOwner,
             Multimap<T, EntityOwnershipListener> listenerMap) {
         Collection<EntityOwnershipListener> listeners = listenerMap.get(mapKey);
         if(!listeners.isEmpty()) {
-            notifyListeners(entity, wasOwner, isOwner, listeners);
+            notifyListeners(entity, wasOwner, isOwner, hasOwner, listeners);
         }
     }
 
-    private void notifyListeners(Entity entity, boolean wasOwner, boolean isOwner,
+    private void notifyListeners(Entity entity, boolean wasOwner, boolean isOwner, boolean hasOwner,
             Collection<EntityOwnershipListener> listeners) {
-        EntityOwnershipChanged changed = new EntityOwnershipChanged(entity, wasOwner, isOwner);
+        EntityOwnershipChange changed = new EntityOwnershipChange(entity, wasOwner, isOwner, hasOwner);
         for(EntityOwnershipListener listener: listeners) {
             ActorRef listenerActor = listenerActorFor(listener);