From: Jason Ye Date: Thu, 18 Jul 2013 04:55:55 +0000 (-0700) Subject: Change default timeout to 30 sec. X-Git-Tag: releasepom-0.1.0~276^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=69928220bcd07207508f4f53ac11cf2035aea66d Change default timeout to 30 sec. Signed-off-by: Jason Ye --- diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini index 6e8a355523..6bf09bb368 100644 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini +++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini @@ -64,8 +64,8 @@ org.eclipse.gemini.web.tomcat.config.path=configuration/tomcat-server.xml # of.discoveryInterval=300 # The timeout multiple of discovery interval # of.discoveryTimeoutMultiple=2 -# For newly added ports, allow one more retry if the elapsed time exceeds this threshold (default 10 sec) -# of.discoveryThreshold=10 +# For newly added ports, allow one more retry if the elapsed time exceeds this threshold (default 30 sec) +# of.discoveryThreshold=30 # The maximum number of ports handled in one discovery batch (default 1024) # of.discoveryBatchMaxPorts=1024 diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java index ebd5a68341..b3cfde9c14 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java @@ -167,7 +167,7 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa public enum DiscoveryPeriod { INTERVAL (300), AGEOUT (120), - THRESHOLD (10); + THRESHOLD (30); private int time; // sec private int tick; // tick