Removed usage of deprecated ClusterCommunicationService APIs

Change-Id: Id306dadad48d1bad7b3fbde3a40ba3e0fdac4cbc

Removed usage of deprecated ClusterCommunicationService APIs
Change-Id: Id306dadad48d1bad7b3fbde3a40ba3e0fdac4cbc
Madan Jampani
Commit 01e05fbed2eccb734ade964b8db78a05cc40ad24 01e05fbe 1 parent d3520102
Showing 3 changed files with 50 additions and 86 deletions
core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java
core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
core/store/dist/src/main/java/org/onosproject/store/packet/impl/DistributedPacketStore.java
--- a/core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java
View file @01e05fb
+++ b/core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java
View file @01e05fb
@@ -17,6 +17,7 @@ package org.onosproject.store.app;
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableSet;
+
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -39,8 +40,6 @@ import org.onosproject.core.ApplicationIdStore;
 import org.onosproject.core.DefaultApplication;
 import org.onosproject.core.Permission;
 import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
-import org.onosproject.store.cluster.messaging.ClusterMessage;
-import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
 import org.onosproject.store.cluster.messaging.MessageSubject;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.onosproject.store.service.EventuallyConsistentMap;
@@ -48,10 +47,12 @@ import org.onosproject.store.service.EventuallyConsistentMapEvent;
 import org.onosproject.store.service.EventuallyConsistentMapListener;
 import org.onosproject.store.service.LogicalClockService;
 import org.onosproject.store.service.MultiValuedTimestamp;
+import org.onosproject.store.service.StorageException;
 import org.onosproject.store.service.StorageService;
 import org.slf4j.Logger;
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
@@ -126,7 +127,17 @@ public class GossipApplicationStore extends ApplicationArchive
         messageHandlingExecutor = Executors.newSingleThreadExecutor(
                 groupedThreads("onos/store/app", "message-handler"));
-        clusterCommunicator.addSubscriber(APP_BITS_REQUEST, new InternalBitServer(), messageHandlingExecutor);
+        clusterCommunicator.<String, byte[]>addSubscriber(APP_BITS_REQUEST,
+                bytes -> new String(bytes, Charsets.UTF_8),
+                name -> {
+                    try {
+                        return toByteArray(getApplicationInputStream(name));
+                    } catch (IOException e) {
+                        throw new StorageException(e);
+                    }
+                },
+                Function.identity(),
+                messageHandlingExecutor);
         // FIXME: Consider consolidating into a single map.
@@ -394,21 +405,6 @@ public class GossipApplicationStore extends ApplicationArchive
     }
     /**
-     * Responder to requests for application bits.
-     */
-    private class InternalBitServer implements ClusterMessageHandler {
-        @Override
-        public void handle(ClusterMessage message) {
-            String name = new String(message.payload(), Charsets.UTF_8);
-            try {
-                message.respond(toByteArray(getApplicationInputStream(name)));
-            } catch (Exception e) {
-                log.debug("Unable to read bits for application {}", name);
-            }
-        }
-    }
-
-    /**
      * Prunes applications which are not in the map, but are on disk.
      */
     private void pruneUninstalledApps() {
--- a/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
View file @01e05fb
+++ b/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
View file @01e05fb
@@ -60,8 +60,6 @@ import org.onosproject.net.group.StoredGroupBucketEntry;
 import org.onosproject.net.group.StoredGroupEntry;
 import org.onosproject.store.AbstractStore;
 import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
-import org.onosproject.store.cluster.messaging.ClusterMessage;
-import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
 import org.onosproject.store.service.MultiValuedTimestamp;
 import org.onosproject.store.serializers.DeviceIdSerializer;
 import org.onosproject.store.serializers.KryoNamespaces;
@@ -198,10 +196,11 @@ public class DistributedGroupStore
                 newFixedThreadPool(MESSAGE_HANDLER_THREAD_POOL_SIZE,
                                    groupedThreads("onos/store/group",
                                                   "message-handlers"));
-        clusterCommunicator.
+
-            addSubscriber(GroupStoreMessageSubjects.REMOTE_GROUP_OP_REQUEST,
+        clusterCommunicator.addSubscriber(GroupStoreMessageSubjects.REMOTE_GROUP_OP_REQUEST,
-                          new ClusterGroupMsgHandler(),
+                kryoBuilder.build()::deserialize,
-                          messageHandlingExecutor);
+                this::process,
+                messageHandlingExecutor);
         log.debug("Creating EC map groupstorekeymap");
         EventuallyConsistentMapBuilder<GroupStoreKeyMapKey, StoredGroupEntry>
@@ -970,45 +969,27 @@ public class DistributedGroupStore
             }
         }
     }
-    /**
+
-     * Message handler to receive messages from group subsystems of
+    private void process(GroupStoreMessage groupOp) {
-     * other cluster members.
+        log.debug("Received remote group operation {} request for device {}",
-     */
+                groupOp.type(),
-    private final class ClusterGroupMsgHandler
+                groupOp.deviceId());
-                    implements ClusterMessageHandler {
+      if (!mastershipService.isLocalMaster(groupOp.deviceId())) {
-        @Override
+          log.warn("This node is not MASTER for device {}", groupOp.deviceId());
-        public void handle(ClusterMessage message) {
+          return;
-            if (message.subject().equals(
+      }
-                    GroupStoreMessageSubjects.REMOTE_GROUP_OP_REQUEST)) {
+      if (groupOp.type() == GroupStoreMessage.Type.ADD) {
-                GroupStoreMessage groupOp = kryoBuilder.
+          storeGroupDescriptionInternal(groupOp.groupDesc());
-                        build().deserialize(message.payload());
+      } else if (groupOp.type() == GroupStoreMessage.Type.UPDATE) {
-                log.debug("received remote group operation {} request for device {}",
+          updateGroupDescriptionInternal(groupOp.deviceId(),
-                          groupOp.type(),
+                                         groupOp.appCookie(),
-                          groupOp.deviceId());
+                                         groupOp.updateType(),
-                if (mastershipService.
+                                         groupOp.updateBuckets(),
-                        getLocalRole(groupOp.deviceId()) !=
+                                         groupOp.newAppCookie());
-                        MastershipRole.MASTER) {
+      } else if (groupOp.type() == GroupStoreMessage.Type.DELETE) {
-                    log.warn("ClusterGroupMsgHandler: This node is not "
+          deleteGroupDescriptionInternal(groupOp.deviceId(),
-                            + "MASTER for device {}", groupOp.deviceId());
+                                         groupOp.appCookie());
-                    return;
+      }
-                }
-                if (groupOp.type() == GroupStoreMessage.Type.ADD) {
-                    storeGroupDescriptionInternal(groupOp.groupDesc());
-                } else if (groupOp.type() == GroupStoreMessage.Type.UPDATE) {
-                    updateGroupDescriptionInternal(groupOp.deviceId(),
-                                                   groupOp.appCookie(),
-                                                   groupOp.updateType(),
-                                                   groupOp.updateBuckets(),
-                                                   groupOp.newAppCookie());
-                } else if (groupOp.type() == GroupStoreMessage.Type.DELETE) {
-                    deleteGroupDescriptionInternal(groupOp.deviceId(),
-                                                   groupOp.appCookie());
-                }
-            } else {
-                log.warn("ClusterGroupMsgHandler: Unknown remote message type {}",
-                         message.subject());
-            }
-        }
     }
     /**
--- a/core/store/dist/src/main/java/org/onosproject/store/packet/impl/DistributedPacketStore.java
View file @01e05fb
+++ b/core/store/dist/src/main/java/org/onosproject/store/packet/impl/DistributedPacketStore.java
View file @01e05fb
@@ -35,8 +35,6 @@ import org.onosproject.net.packet.PacketStore;
 import org.onosproject.net.packet.PacketStoreDelegate;
 import org.onosproject.store.AbstractStore;
 import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
-import org.onosproject.store.cluster.messaging.ClusterMessage;
-import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
 import org.onosproject.store.cluster.messaging.MessageSubject;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.onosproject.store.serializers.KryoSerializer;
@@ -104,9 +102,10 @@ public class DistributedPacketStore
                 MESSAGE_HANDLER_THREAD_POOL_SIZE,
                 groupedThreads("onos/store/packet", "message-handlers"));
-        communicationService.addSubscriber(PACKET_OUT_SUBJECT,
+        communicationService.<OutboundPacket>addSubscriber(PACKET_OUT_SUBJECT,
-                                           new InternalClusterMessageHandler(),
+                SERIALIZER::decode,
-                                           messageHandlingExecutor);
+                packet -> notifyDelegate(new PacketEvent(Type.EMIT, packet)),
+                messageHandlingExecutor);
         tracker = new PacketRequestTracker();
@@ -134,9 +133,12 @@ public class DistributedPacketStore
             return;
         }
-        // TODO check unicast return value
+        communicationService.unicast(packet, PACKET_OUT_SUBJECT, SERIALIZER::encode, master)
-        communicationService.unicast(packet, PACKET_OUT_SUBJECT, SERIALIZER::encode, master);
+                            .whenComplete((r, error) -> {
-        // error log: log.warn("Failed to send packet-out to {}", master);
+                                if (error != null) {
+                                    log.warn("Failed to send packet-out to {}", master, error);
+                                }
+                            });
     }
     @Override
@@ -154,21 +156,6 @@ public class DistributedPacketStore
         return tracker.requests();
     }
-    /**
-     * Handles incoming cluster messages.
-     */
-    private class InternalClusterMessageHandler implements ClusterMessageHandler {
-        @Override
-        public void handle(ClusterMessage message) {
-            if (!message.subject().equals(PACKET_OUT_SUBJECT)) {
-                log.warn("Received message with wrong subject: {}", message);
-            }
-
-            OutboundPacket packet = SERIALIZER.decode(message.payload());
-            notifyDelegate(new PacketEvent(Type.EMIT, packet));
-        }
-    }
-
     private class PacketRequestTracker {
         private ConsistentMap<TrafficSelector, Set<PacketRequest>> requests;