홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
Committed by Gerrit Code Review
9b7a32d1 1 parent e01de782

ClusterCommunicationManager: only serialize once for broadcast 

Change-Id: Ife78af3c758c87eeb8a79cdbf51b5307b8b1ca88
Inline Side-by-side
Showing 1 changed file with 14 additions and 7 deletions
......@@ -103,9 +103,10 @@ public class ClusterCommunicationManager
public boolean broadcast(ClusterMessage message) {
boolean ok = true;
final ControllerNode localNode = clusterService.getLocalNode();
byte[] payload = SERIALIZER.encode(message);
for (ControllerNode node : clusterService.getNodes()) {
if (!node.equals(localNode)) {
ok = unicastUnchecked(message, node.id()) && ok;
ok = unicastUnchecked(message.subject(), payload, node.id()) && ok;
}
}
return ok;
......@@ -114,8 +115,9 @@ public class ClusterCommunicationManager
@Override
public boolean broadcastIncludeSelf(ClusterMessage message) {
boolean ok = true;
byte[] payload = SERIALIZER.encode(message);
for (ControllerNode node : clusterService.getNodes()) {
ok = unicastUnchecked(message, node.id()) && ok;
ok = unicastUnchecked(message.subject(), payload, node.id()) && ok;
}
return ok;
}
......@@ -124,9 +126,10 @@ public class ClusterCommunicationManager
public boolean multicast(ClusterMessage message, Set<NodeId> nodes) {
boolean ok = true;
final ControllerNode localNode = clusterService.getLocalNode();
byte[] payload = SERIALIZER.encode(message);
for (NodeId nodeId : nodes) {
if (!nodeId.equals(localNode.id())) {
ok = unicastUnchecked(message, nodeId) && ok;
ok = unicastUnchecked(message.subject(), payload, nodeId) && ok;
}
}
return ok;
......@@ -134,12 +137,15 @@ public class ClusterCommunicationManager
@Override
public boolean unicast(ClusterMessage message, NodeId toNodeId) throws IOException {
return unicast(message.subject(), SERIALIZER.encode(message), toNodeId);
}
private boolean unicast(MessageSubject subject, byte[] payload, NodeId toNodeId) throws IOException {
ControllerNode node = clusterService.getNode(toNodeId);
checkArgument(node != null, "Unknown nodeId: %s", toNodeId);
Endpoint nodeEp = new Endpoint(node.ip().toString(), node.tcpPort());
try {
messagingService.sendAsync(nodeEp,
message.subject().value(), SERIALIZER.encode(message));
messagingService.sendAsync(nodeEp, subject.value(), payload);
return true;
} catch (IOException e) {
log.trace("Failed to send cluster message to nodeId: " + toNodeId, e);
......@@ -147,9 +153,10 @@ public class ClusterCommunicationManager
}
}
private boolean unicastUnchecked(ClusterMessage message, NodeId toNodeId) {
private boolean unicastUnchecked(MessageSubject subject, byte[] payload, NodeId toNodeId) {
try {
return unicast(message, toNodeId);
return unicast(subject, payload, toNodeId);
} catch (IOException e) {
return false;
}
......