홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
409b9cbf 1 parent 8d00378e

Increasing tolerance for evicting latent listeners. 

Change-Id: I3ab62084479185160ef7cc8ba5035a34cb96ad15
Inline Side-by-side
Showing 2 changed files with 7 additions and 4 deletions
...@@ -49,7 +49,7 @@ public class CoreEventDispatcher extends DefaultEventSinkRegistry ...@@ -49,7 +49,7 @@ public class CoreEventDispatcher extends DefaultEventSinkRegistry
49 private final Logger log = getLogger(getClass()); 49 private final Logger log = getLogger(getClass());
50 50
51 // Default number of millis a sink can take to process an event. 51 // Default number of millis a sink can take to process an event.
52 - private static final long DEFAULT_EXECUTE_MS = 2_000; // ms 52 + private static final long DEFAULT_EXECUTE_MS = 5_000; // ms
53 private static final long WATCHDOG_MS = 250; // ms 53 private static final long WATCHDOG_MS = 250; // ms
54 54
55 private final BlockingQueue<Event> events = new LinkedBlockingQueue<>(); 55 private final BlockingQueue<Event> events = new LinkedBlockingQueue<>();
...@@ -122,6 +122,8 @@ public class CoreEventDispatcher extends DefaultEventSinkRegistry ...@@ -122,6 +122,8 @@ public class CoreEventDispatcher extends DefaultEventSinkRegistry
122 break; 122 break;
123 } 123 }
124 process(event); 124 process(event);
125 + } catch (InterruptedException e) {
126 + log.warn("Dispatch loop interrupted");
125 } catch (Exception e) { 127 } catch (Exception e) {
126 log.warn("Error encountered while dispatching event:", e); 128 log.warn("Error encountered while dispatching event:", e);
127 } 129 }
......
...@@ -34,13 +34,14 @@ ...@@ -34,13 +34,14 @@
34 <step name="Check-Summary" requires="Wait-For-Mininet" 34 <step name="Check-Summary" requires="Wait-For-Mininet"
35 exec="onos-check-summary ${OC1} [0-9]* 25 140 0"/> 35 exec="onos-check-summary ${OC1} [0-9]* 25 140 0"/>
36 36
37 - <step name="Check-Flows" requires="Wait-For-Mininet"
38 - exec="onos-check-flows ${OC1}"/>
39 -
40 <step name="Balance-Masters" requires="Check-Summary" 37 <step name="Balance-Masters" requires="Check-Summary"
41 exec="onos ${OC1} balance-masters"/> 38 exec="onos ${OC1} balance-masters"/>
42 39
43 <step name="Pause-For-Masters" requires="Balance-Masters" 40 <step name="Pause-For-Masters" requires="Balance-Masters"
44 exec="sleep 10"/> 41 exec="sleep 10"/>
42 +
43 + <step name="Check-Flows" requires="~Pause-For-Masters"
44 + exec="onos-check-flows ${OC1}"/>
45 +
45 </group> 46 </group>
46 </scenario> 47 </scenario>
...\ No newline at end of file ...\ No newline at end of file
......