홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sahil Lele
Committed by Gerrit Code Review
0f8d00ef 1 parent 4e0e0936

ONOS-2432 Fixed blackhole npe by only acting on src and dst hosts that are not null 

Change-Id: Iae587a8b873b0d697bb6d723be2afafd9bb56de4
Inline Side-by-side
Showing 1 changed file with 8 additions and 3 deletions
......@@ -698,20 +698,25 @@ public class ReactiveForwarding {
for (SrcDstPair sd : pairs) {
// get the edge deviceID for the src host
DeviceId srcId = hostService.getHost(HostId.hostId(sd.src)).location().deviceId();
DeviceId dstId = hostService.getHost(HostId.hostId(sd.dst)).location().deviceId();
Host srcHost = hostService.getHost(HostId.hostId(sd.src));
Host dstHost = hostService.getHost(HostId.hostId(sd.dst));
if (srcHost != null && dstHost != null) {
DeviceId srcId = srcHost.location().deviceId();
DeviceId dstId = dstHost.location().deviceId();
log.trace("SRC ID is " + srcId + ", DST ID is " + dstId);
cleanFlowRules(sd, egress.deviceId());
Set<Path> shortestPaths = srcPaths.get(srcId);
if (shortestPaths == null) {
shortestPaths = topologyService.getPaths(topologyService.currentTopology(), egress.deviceId(), srcId);
shortestPaths = topologyService.getPaths(topologyService.currentTopology(),
egress.deviceId(), srcId);
srcPaths.put(srcId, shortestPaths);
}
backTrackBadNodes(shortestPaths, dstId, sd);
}
}
}
// Backtracks from link down event to remove flows that lead to blackhole
private void backTrackBadNodes(Set<Path> shortestPaths, DeviceId dstId, SrcDstPair sd) {
......