홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Madan Jampani
Committed by Pavlin Radoslavov
4e729aff 1 parent e2ff25a1

ClusterMessagingService broadcast and broadcastIncludeSelf should use unicastUnc… 

…hecked for sending point to point messages.

Change-Id: Ief52b2bb080de5a7226156b46b34086cc3d32ddd
Inline Side-by-side
Showing 1 changed file with 7 additions and 7 deletions
...@@ -26,6 +26,11 @@ import org.apache.felix.scr.annotations.Deactivate; ...@@ -26,6 +26,11 @@ import org.apache.felix.scr.annotations.Deactivate;
26 import org.apache.felix.scr.annotations.Reference; 26 import org.apache.felix.scr.annotations.Reference;
27 import org.apache.felix.scr.annotations.ReferenceCardinality; 27 import org.apache.felix.scr.annotations.ReferenceCardinality;
28 import org.apache.felix.scr.annotations.Service; 28 import org.apache.felix.scr.annotations.Service;
29 +import org.onlab.netty.Endpoint;
30 +import org.onlab.netty.Message;
31 +import org.onlab.netty.MessageHandler;
32 +import org.onlab.netty.MessagingService;
33 +import org.onlab.netty.NettyMessagingService;
29 import org.onlab.onos.cluster.ClusterService; 34 import org.onlab.onos.cluster.ClusterService;
30 import org.onlab.onos.cluster.ControllerNode; 35 import org.onlab.onos.cluster.ControllerNode;
31 import org.onlab.onos.cluster.NodeId; 36 import org.onlab.onos.cluster.NodeId;
...@@ -39,11 +44,6 @@ import org.onlab.onos.store.serializers.KryoSerializer; ...@@ -39,11 +44,6 @@ import org.onlab.onos.store.serializers.KryoSerializer;
39 import org.onlab.onos.store.serializers.impl.ClusterMessageSerializer; 44 import org.onlab.onos.store.serializers.impl.ClusterMessageSerializer;
40 import org.onlab.onos.store.serializers.impl.MessageSubjectSerializer; 45 import org.onlab.onos.store.serializers.impl.MessageSubjectSerializer;
41 import org.onlab.util.KryoNamespace; 46 import org.onlab.util.KryoNamespace;
42 -import org.onlab.netty.Endpoint;
43 -import org.onlab.netty.Message;
44 -import org.onlab.netty.MessageHandler;
45 -import org.onlab.netty.MessagingService;
46 -import org.onlab.netty.NettyMessagingService;
47 import org.slf4j.Logger; 47 import org.slf4j.Logger;
48 import org.slf4j.LoggerFactory; 48 import org.slf4j.LoggerFactory;
49 49
...@@ -109,7 +109,7 @@ public class ClusterCommunicationManager ...@@ -109,7 +109,7 @@ public class ClusterCommunicationManager
109 final ControllerNode localNode = clusterService.getLocalNode(); 109 final ControllerNode localNode = clusterService.getLocalNode();
110 for (ControllerNode node : clusterService.getNodes()) { 110 for (ControllerNode node : clusterService.getNodes()) {
111 if (!node.equals(localNode)) { 111 if (!node.equals(localNode)) {
112 - ok = unicast(message, node.id()) && ok; 112 + ok = unicastUnchecked(message, node.id()) && ok;
113 } 113 }
114 } 114 }
115 return ok; 115 return ok;
...@@ -119,7 +119,7 @@ public class ClusterCommunicationManager ...@@ -119,7 +119,7 @@ public class ClusterCommunicationManager
119 public boolean broadcastIncludeSelf(ClusterMessage message) throws IOException { 119 public boolean broadcastIncludeSelf(ClusterMessage message) throws IOException {
120 boolean ok = true; 120 boolean ok = true;
121 for (ControllerNode node : clusterService.getNodes()) { 121 for (ControllerNode node : clusterService.getNodes()) {
122 - ok = unicast(message, node.id()) && ok; 122 + ok = unicastUnchecked(message, node.id()) && ok;
123 } 123 }
124 return ok; 124 return ok;
125 } 125 }
......