Eliminate the peformance penalty introduced in ReplicaInfoService.getReplicaInfoFor

Change-Id: Ie37d7e80c4dbf37a2ae6f452f6f66f4505d69a29

@@ -22,6 +22,7 @@ import java.util.List;
 
 
 import org.onosproject.cluster.NodeId;
 import org.onosproject.cluster.NodeId;
 
 
+import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 import com.google.common.base.Optional;
 
 
 /**
 /**
@@ -61,6 +62,21 @@ public final class ReplicaInfo {
         return backups;
         return backups;
     }
     }
 
 
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(master, backups);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof ReplicaInfo))  {
+            return false;
+        }
+        ReplicaInfo that = (ReplicaInfo) other;
+        return Objects.equal(this.master, that.master) &&
+                Objects.equal(this.backups, that.backups);
+    }
+
     // for Serializer
     // for Serializer
     private ReplicaInfo() {
     private ReplicaInfo() {
         this.master = Optional.absent();
         this.master = Optional.absent();

@@ -22,6 +22,7 @@ import static org.onosproject.store.flow.ReplicaInfoEvent.Type.BACKUPS_CHANGED;
 
 
 import java.util.Collections;
 import java.util.Collections;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Component;
@@ -43,6 +44,10 @@ import org.onosproject.store.flow.ReplicaInfoEventListener;
 import org.onosproject.store.flow.ReplicaInfoService;
 import org.onosproject.store.flow.ReplicaInfoService;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 
 
+import com.google.common.base.Objects;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Maps;
+
 /**
 /**
  * Manages replica placement information.
  * Manages replica placement information.
  */
  */
@@ -63,6 +68,8 @@ public class ReplicaInfoManager implements ReplicaInfoService {
     protected final AbstractListenerRegistry<ReplicaInfoEvent, ReplicaInfoEventListener>
     protected final AbstractListenerRegistry<ReplicaInfoEvent, ReplicaInfoEventListener>
         listenerRegistry = new AbstractListenerRegistry<>();
         listenerRegistry = new AbstractListenerRegistry<>();
 
 
+    private final Map<DeviceId, ReplicaInfo> deviceReplicaInfoMap = Maps.newConcurrentMap();
+
     @Activate
     @Activate
     public void activate() {
     public void activate() {
         eventDispatcher.addSink(ReplicaInfoEvent.class, listenerRegistry);
         eventDispatcher.addSink(ReplicaInfoEvent.class, listenerRegistry);
@@ -79,7 +86,9 @@ public class ReplicaInfoManager implements ReplicaInfoService {
 
 
     @Override
     @Override
     public ReplicaInfo getReplicaInfoFor(DeviceId deviceId) {
     public ReplicaInfo getReplicaInfoFor(DeviceId deviceId) {
-        return buildFromRoleInfo(mastershipService.getNodesFor(deviceId));
+        return deviceReplicaInfoMap.computeIfAbsent(
+                    deviceId,
+                    id -> buildFromRoleInfo(mastershipService.getNodesFor(deviceId)));
     }
     }
 
 
     @Override
     @Override
@@ -94,7 +103,7 @@ public class ReplicaInfoManager implements ReplicaInfoService {
 
 
     private static ReplicaInfo buildFromRoleInfo(RoleInfo roles) {
     private static ReplicaInfo buildFromRoleInfo(RoleInfo roles) {
         List<NodeId> backups = roles.backups() == null ?
         List<NodeId> backups = roles.backups() == null ?
-                Collections.emptyList() : roles.backups();
+                Collections.emptyList() : ImmutableList.copyOf(roles.backups());
         return new ReplicaInfo(roles.master(), backups);
         return new ReplicaInfo(roles.master(), backups);
     }
     }
 
 
@@ -102,8 +111,12 @@ public class ReplicaInfoManager implements ReplicaInfoService {
 
 
         @Override
         @Override
         public void event(MastershipEvent event) {
         public void event(MastershipEvent event) {
+            final DeviceId deviceId = event.subject();
             final ReplicaInfo replicaInfo = buildFromRoleInfo(event.roleInfo());
             final ReplicaInfo replicaInfo = buildFromRoleInfo(event.roleInfo());
-
+            ReplicaInfo oldReplicaInfo = deviceReplicaInfoMap.put(deviceId, replicaInfo);
+            if (Objects.equal(oldReplicaInfo, replicaInfo)) {
+                return;
+            }
             switch (event.type()) {
             switch (event.type()) {
             case MASTER_CHANGED:
             case MASTER_CHANGED:
                 eventDispatcher.post(new ReplicaInfoEvent(MASTER_CHANGED,
                 eventDispatcher.post(new ReplicaInfoEvent(MASTER_CHANGED,

@@ -17,6 +17,7 @@ package org.onosproject.store.mastership.impl;
 
 
 import static org.onlab.util.Tools.groupedThreads;
 import static org.onlab.util.Tools.groupedThreads;
 import static org.onlab.util.Tools.futureGetOrElse;
 import static org.onlab.util.Tools.futureGetOrElse;
+import static org.onosproject.mastership.MastershipEvent.Type.BACKUPS_CHANGED;
 import static org.onosproject.mastership.MastershipEvent.Type.MASTER_CHANGED;
 import static org.onosproject.mastership.MastershipEvent.Type.MASTER_CHANGED;
 import static org.slf4j.LoggerFactory.getLogger;
 import static org.slf4j.LoggerFactory.getLogger;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkArgument;
@@ -409,6 +410,9 @@ public class ConsistentDeviceMastershipStore
                 case LEADER_BOOTED:
                 case LEADER_BOOTED:
                     notifyDelegate(new MastershipEvent(MASTER_CHANGED, deviceId, getNodes(deviceId)));
                     notifyDelegate(new MastershipEvent(MASTER_CHANGED, deviceId, getNodes(deviceId)));
                     break;
                     break;
+                case CANDIDATES_CHANGED:
+                    notifyDelegate(new MastershipEvent(BACKUPS_CHANGED, deviceId, getNodes(deviceId)));
+                    break;
                 default:
                 default:
                     return;
                     return;
                 }
                 }