Let an inactive switch remove the links from the network map. The link update code will add it back.
This is the fix the case where some inactive switches still have links.
Decrease the logging from AddOrUpdateLink().
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
index fa75769..11643fa 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -1230,9 +1230,8 @@
removeLinkFromStorage(lt);
// remote link from network map
- if (hasControl) {
- linkStore.update(lt, DM_OPERATION.DELETE);
- }
+ linkStore.update(lt, DM_OPERATION.DELETE);
+
// TODO Whenever link is removed, it has to checked if
// the switchports must be added to quarantine.
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
index 83abc8e..176a1a0 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
@@ -72,7 +72,7 @@
public void addOrUpdateLink(Link lt, LinkInfo linkinfo, DM_OPERATION op) {
Vertex vportSrc = null, vportDst = null;
- log.debug("addOrUpdateLink(): op {} {} {}", new Object[]{op, lt, linkinfo});
+ log.trace("addOrUpdateLink(): op {} {} {}", new Object[]{op, lt, linkinfo});
try {
// get source port vertex
diff --git a/src/main/java/net/onrc/onos/registry/controller/ZookeeperRegistry.java b/src/main/java/net/onrc/onos/registry/controller/ZookeeperRegistry.java
index b9d04d4..a929aa9 100644
--- a/src/main/java/net/onrc/onos/registry/controller/ZookeeperRegistry.java
+++ b/src/main/java/net/onrc/onos/registry/controller/ZookeeperRegistry.java
@@ -223,6 +223,7 @@
} catch (IOException e) {
//I think it's OK not to do anything here. Either the node got
//deleted correctly, or the connection went down and the node got deleted.
+ log.debug("releaseControl: caught IOException {}", dpidStr);
}
}
diff --git a/start-rest.sh b/start-rest.sh
index 3006e5e..564eccf 100755
--- a/start-rest.sh
+++ b/start-rest.sh
@@ -58,9 +58,6 @@
stop)
stop
;;
- deldb)
- deldb
- ;;
status)
status
;;