Moving group store to consistent map

Change-Id: Id3c23c0cd9d7c713bceffc7bd9125aa3de99c45e

Moving group store to consistent map
Change-Id: Id3c23c0cd9d7c713bceffc7bd9125aa3de99c45e
Madan Jampani · Gerrit Code Review
Commit 0b84753fb997ec94435c7793dcfb0b7809d582cd 0b84753f 1 parent 268c4f9e
Showing 2 changed files with 34 additions and 45 deletions
core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
core/store/dist/src/test/java/org/onosproject/store/group/impl/DistributedGroupStoreTest.java
--- a/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
View file @0b84753
+++ b/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
View file @0b84753
@@ -56,11 +56,12 @@ import org.onosproject.store.AbstractStore;
 import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
 import org.onosproject.store.service.MultiValuedTimestamp;
 import org.onosproject.store.serializers.KryoNamespaces;
-import org.onosproject.store.service.EventuallyConsistentMap;
+import org.onosproject.store.service.ConsistentMap;
-import org.onosproject.store.service.EventuallyConsistentMapBuilder;
+import org.onosproject.store.service.MapEvent;
-import org.onosproject.store.service.EventuallyConsistentMapEvent;
+import org.onosproject.store.service.MapEventListener;
-import org.onosproject.store.service.EventuallyConsistentMapListener;
+import org.onosproject.store.service.Serializer;
 import org.onosproject.store.service.StorageService;
+import org.onosproject.store.service.Versioned;
 import org.slf4j.Logger;
 import java.util.ArrayList;
@@ -70,6 +71,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Optional;
@@ -79,7 +81,6 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 import static org.apache.commons.lang3.concurrent.ConcurrentUtils.createIfAbsentUnchecked;
@@ -113,12 +114,12 @@ public class DistributedGroupStore
     protected MastershipService mastershipService;
     // Per device group table with (device id + app cookie) as key
-    private EventuallyConsistentMap<GroupStoreKeyMapKey,
+    private ConsistentMap<GroupStoreKeyMapKey,
         StoredGroupEntry> groupStoreEntriesByKey = null;
     // Per device group table with (device id + group id) as key
     private final ConcurrentMap<DeviceId, ConcurrentMap<GroupId, StoredGroupEntry>>
         groupEntriesById = new ConcurrentHashMap<>();
-    private EventuallyConsistentMap<GroupStoreKeyMapKey,
+    private ConsistentMap<GroupStoreKeyMapKey,
         StoredGroupEntry> auditPendingReqQueue = null;
     private final ConcurrentMap<DeviceId, ConcurrentMap<GroupId, Group>>
             extraneousGroupEntriesById = new ConcurrentHashMap<>();
@@ -131,8 +132,6 @@ public class DistributedGroupStore
     private KryoNamespace.Builder kryoBuilder = null;
-    private final AtomicLong sequenceNumber = new AtomicLong(0);
-
     private KryoNamespace clusterMsgSerializer;
     @Activate
@@ -169,29 +168,21 @@ public class DistributedGroupStore
                 this::process,
                 messageHandlingExecutor);
-        log.debug("Creating EC map groupstorekeymap");
+        log.debug("Creating Consistent map onos-group-store-keymap");
-        EventuallyConsistentMapBuilder<GroupStoreKeyMapKey, StoredGroupEntry>
-                keyMapBuilder = storageService.eventuallyConsistentMapBuilder();
-        groupStoreEntriesByKey = keyMapBuilder
+        groupStoreEntriesByKey = storageService.<GroupStoreKeyMapKey, StoredGroupEntry>consistentMapBuilder()
-                .withName("groupstorekeymap")
+                .withName("onos-group-store-keymap")
-                .withSerializer(kryoBuilder)
+                .withSerializer(Serializer.using(kryoBuilder.build()))
-                .withTimestampProvider((k, v) -> new MultiValuedTimestamp<>(System.currentTimeMillis(),
-                                                                            sequenceNumber.getAndIncrement()))
                 .build();
         groupStoreEntriesByKey.addListener(new GroupStoreKeyMapListener());
         log.debug("Current size of groupstorekeymap:{}",
                   groupStoreEntriesByKey.size());
-        log.debug("Creating EC map pendinggroupkeymap");
+        log.debug("Creating Consistent map pendinggroupkeymap");
-        EventuallyConsistentMapBuilder<GroupStoreKeyMapKey, StoredGroupEntry>
-                auditMapBuilder = storageService.eventuallyConsistentMapBuilder();
-        auditPendingReqQueue = auditMapBuilder
+        auditPendingReqQueue = storageService.<GroupStoreKeyMapKey, StoredGroupEntry>consistentMapBuilder()
-                .withName("pendinggroupkeymap")
+                .withName("onos-pending-group-keymap")
-                .withSerializer(kryoBuilder)
+                .withSerializer(Serializer.using(kryoBuilder.build()))
-                .withTimestampProvider((k, v) -> new MultiValuedTimestamp<>(System.currentTimeMillis(),
-                                                                            sequenceNumber.getAndIncrement()))
                 .build();
         log.debug("Current size of pendinggroupkeymap:{}",
                   auditPendingReqQueue.size());
@@ -222,9 +213,9 @@ public class DistributedGroupStore
      *
      * @return Map representing group key table.
      */
-    private EventuallyConsistentMap<GroupStoreKeyMapKey, StoredGroupEntry>
+    private Map<GroupStoreKeyMapKey, StoredGroupEntry>
         getGroupStoreKeyMap() {
-        return groupStoreEntriesByKey;
+        return groupStoreEntriesByKey.asJavaMap();
     }
     /**
@@ -243,9 +234,9 @@ public class DistributedGroupStore
      *
      * @return Map representing group key table.
      */
-    private EventuallyConsistentMap<GroupStoreKeyMapKey, StoredGroupEntry>
+    private Map<GroupStoreKeyMapKey, StoredGroupEntry>
         getPendingGroupKeyTable() {
-        return auditPendingReqQueue;
+        return auditPendingReqQueue.asJavaMap();
     }
     /**
@@ -445,7 +436,7 @@ public class DistributedGroupStore
                     groupDesc.deviceId());
             StoredGroupEntry group = new DefaultGroup(dummyGroupId, groupDesc);
             group.setState(GroupState.WAITING_AUDIT_COMPLETE);
-            EventuallyConsistentMap<GroupStoreKeyMapKey, StoredGroupEntry> pendingKeyTable =
+            Map<GroupStoreKeyMapKey, StoredGroupEntry> pendingKeyTable =
                     getPendingGroupKeyTable();
             pendingKeyTable.put(new GroupStoreKeyMapKey(groupDesc.deviceId(),
                                                         groupDesc.appCookie()),
@@ -851,7 +842,7 @@ public class DistributedGroupStore
         Set<Entry<GroupStoreKeyMapKey, StoredGroupEntry>> entryPendingRemove =
                 new HashSet<>();
-        groupStoreEntriesByKey.entrySet().stream()
+        getGroupStoreKeyMap().entrySet().stream()
                 .filter(entry -> entry.getKey().deviceId().equals(deviceId))
                 .forEach(entryPendingRemove::add);
@@ -987,14 +978,13 @@ public class DistributedGroupStore
      * Map handler to receive any events when the group key map is updated.
      */
     private class GroupStoreKeyMapListener implements
-            EventuallyConsistentMapListener<GroupStoreKeyMapKey, StoredGroupEntry> {
+            MapEventListener<GroupStoreKeyMapKey, StoredGroupEntry> {
         @Override
-        public void event(EventuallyConsistentMapEvent<GroupStoreKeyMapKey,
+        public void event(MapEvent<GroupStoreKeyMapKey, StoredGroupEntry> mapEvent) {
-                                  StoredGroupEntry> mapEvent) {
             GroupEvent groupEvent = null;
             GroupStoreKeyMapKey key = mapEvent.key();
-            StoredGroupEntry group = mapEvent.value();
+            StoredGroupEntry group = Versioned.valueOrNull(mapEvent.newValue());
             if ((key == null) && (group == null)) {
                 log.error("GroupStoreKeyMapListener: Received "
                         + "event {} with null entry", mapEvent.type());
@@ -1014,25 +1004,24 @@ public class DistributedGroupStore
                       mapEvent.type(),
                       group.id(),
                       key.deviceId());
-            if (mapEvent.type() == EventuallyConsistentMapEvent.Type.PUT) {
+            if (mapEvent.type() == MapEvent.Type.INSERT || mapEvent.type() == MapEvent.Type.UPDATE) {
                 // Update the group ID table
                 getGroupIdTable(group.deviceId()).put(group.id(), group);
-                if (mapEvent.value().state() == Group.GroupState.ADDED) {
+                StoredGroupEntry value = Versioned.valueOrNull(mapEvent.newValue());
-                    if (mapEvent.value().isGroupStateAddedFirstTime()) {
+                if (value.state() == Group.GroupState.ADDED) {
-                        groupEvent = new GroupEvent(Type.GROUP_ADDED,
+                    if (value.isGroupStateAddedFirstTime()) {
-                                                    mapEvent.value());
+                        groupEvent = new GroupEvent(Type.GROUP_ADDED, value);
                         log.trace("Received first time GROUP_ADDED state update for id {} in device {}",
                                 group.id(),
                                 group.deviceId());
                     } else {
-                        groupEvent = new GroupEvent(Type.GROUP_UPDATED,
+                        groupEvent = new GroupEvent(Type.GROUP_UPDATED, value);
-                                                    mapEvent.value());
                         log.trace("Received following GROUP_ADDED state update for id {} in device {}",
                                 group.id(),
                                 group.deviceId());
                     }
                 }
-            } else if (mapEvent.type() == EventuallyConsistentMapEvent.Type.REMOVE) {
+            } else if (mapEvent.type() == MapEvent.Type.REMOVE) {
                 groupEvent = new GroupEvent(Type.GROUP_REMOVED, group);
                 // Remove the entry from the group ID table
                 getGroupIdTable(group.deviceId()).remove(group.id(), group);
--- a/core/store/dist/src/test/java/org/onosproject/store/group/impl/DistributedGroupStoreTest.java
View file @0b84753
+++ b/core/store/dist/src/test/java/org/onosproject/store/group/impl/DistributedGroupStoreTest.java
View file @0b84753
@@ -46,7 +46,7 @@ import org.onosproject.net.group.GroupOperation;
 import org.onosproject.net.group.GroupStore;
 import org.onosproject.net.group.GroupStoreDelegate;
 import org.onosproject.store.cluster.messaging.ClusterCommunicationServiceAdapter;
-import org.onosproject.store.service.EventuallyConsistentMap;
+import org.onosproject.store.service.ConsistentMap;
 import org.onosproject.store.service.TestStorageService;
 import com.google.common.collect.ImmutableList;
@@ -109,7 +109,7 @@ public class DistributedGroupStoreTest {
     DistributedGroupStore groupStoreImpl;
     GroupStore groupStore;
-    EventuallyConsistentMap auditPendingReqQueue;
+    ConsistentMap auditPendingReqQueue;
     static class MasterOfAll extends MastershipServiceAdapter {
         @Override