Increasing tolerance for evicting latent listeners.
Change-Id: I3ab62084479185160ef7cc8ba5035a34cb96ad15
diff --git a/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java b/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
index 2ea308b..79ce74b 100644
--- a/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
+++ b/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
@@ -49,7 +49,7 @@
private final Logger log = getLogger(getClass());
// Default number of millis a sink can take to process an event.
- private static final long DEFAULT_EXECUTE_MS = 2_000; // ms
+ private static final long DEFAULT_EXECUTE_MS = 5_000; // ms
private static final long WATCHDOG_MS = 250; // ms
private final BlockingQueue<Event> events = new LinkedBlockingQueue<>();
@@ -122,6 +122,8 @@
break;
}
process(event);
+ } catch (InterruptedException e) {
+ log.warn("Dispatch loop interrupted");
} catch (Exception e) {
log.warn("Error encountered while dispatching event:", e);
}
diff --git a/tools/test/scenarios/net-setup.xml b/tools/test/scenarios/net-setup.xml
index 63cd9c3..abfd84c 100644
--- a/tools/test/scenarios/net-setup.xml
+++ b/tools/test/scenarios/net-setup.xml
@@ -34,13 +34,14 @@
<step name="Check-Summary" requires="Wait-For-Mininet"
exec="onos-check-summary ${OC1} [0-9]* 25 140 0"/>
- <step name="Check-Flows" requires="Wait-For-Mininet"
- exec="onos-check-flows ${OC1}"/>
-
<step name="Balance-Masters" requires="Check-Summary"
exec="onos ${OC1} balance-masters"/>
<step name="Pause-For-Masters" requires="Balance-Masters"
exec="sleep 10"/>
+
+ <step name="Check-Flows" requires="~Pause-For-Masters"
+ exec="onos-check-flows ${OC1}"/>
+
</group>
</scenario>
\ No newline at end of file