import akka.actor.PoisonPill;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
-import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
+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;
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) {
}
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) {
LOG.debug("{}: Adding EntityOwnershipListener {} for entity type {}", logId, listener, entityType);
- addListener(listener, entityType, entityTypeListenerMap);
- }
-
- void removeEntityOwnershipListener(Entity entity, EntityOwnershipListener listener) {
- LOG.debug("{}: Removing EntityOwnershipListener {} for {}", logId, listener, entity);
-
- removeListener(listener, entity, entityListenerMap);
+ addListener(listener, entityType);
}
void removeEntityOwnershipListener(String entityType, EntityOwnershipListener listener) {
LOG.debug("{}: Removing EntityOwnershipListener {} for entity type {}", logId, listener, entityType);
- removeListener(listener, entityType, entityTypeListenerMap);
+ removeListener(listener, entityType);
}
- 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);
}
- 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, Collections.singleton(listener));
}
- private <T> void notifyListeners(Entity entity, T mapKey, boolean wasOwner, boolean isOwner,
- Multimap<T, EntityOwnershipListener> listenerMap) {
- Collection<EntityOwnershipListener> listeners = listenerMap.get(mapKey);
+ private void notifyListeners(Entity entity, String mapKey, boolean wasOwner, boolean isOwner, boolean hasOwner) {
+ Collection<EntityOwnershipListener> listeners = entityTypeListenerMap.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);
}
}
- private <T> void addListener(EntityOwnershipListener listener, T mapKey,
- Multimap<T, EntityOwnershipListener> toListenerMap) {
- if(toListenerMap.put(mapKey, listener)) {
+ private void addListener(EntityOwnershipListener listener, String mapKey) {
+ if (entityTypeListenerMap.put(mapKey, listener)) {
ListenerActorRefEntry listenerEntry = listenerActorMap.get(listener);
if(listenerEntry == null) {
listenerActorMap.put(listener, new ListenerActorRefEntry());
}
}
- private <T> void removeListener(EntityOwnershipListener listener, T mapKey,
- Multimap<T, EntityOwnershipListener> fromListenerMap) {
- if(fromListenerMap.remove(mapKey, listener)) {
+ private void removeListener(EntityOwnershipListener listener, String mapKey) {
+ if (entityTypeListenerMap.remove(mapKey, listener)) {
ListenerActorRefEntry listenerEntry = listenerActorMap.get(listener);
LOG.debug("{}: Found {}", logId, listenerEntry);