Change default timeout to 30 sec.

Signed-off-by: Jason Ye <yisye@cisco.com>

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
index 6e8a3555234ef8cd668a048fd299eddac823656e..6bf09bb368678b3be59a652bb192da49df5367e4 100644 (file)
--- 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
 # 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
 
 # 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 ebd5a68341b9caa5cc3166f415c3d0ed212d8bf4..b3cfde9c146983b4ac44f115178d5af16da606a6 100644 (file)
--- 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),
     public enum DiscoveryPeriod {
         INTERVAL        (300),
         AGEOUT          (120),

-        THRESHOLD       (10);
+        THRESHOLD       (30);

 
         private int time;   // sec
         private int tick;   // tick
 
         private int time;   // sec
         private int tick;   // tick