Commit 2b3d5777 authored by Mike Hibler's avatar Mike Hibler
Browse files

Merge remote branch 'central/master'

parents 91b465cc 8e8ff4ef
......@@ -328,7 +328,19 @@ while (1) {
while ($now >= $deadline && $node ne "") {
qpop($deadline,$node);
info("POP: $node in ".($deadline-$now).", queue=".qsize()."\n");
handleCtrlEvent($node,$TBTIMEOUT);
#
# If the node is no longer in the nodes array, it was most
# likely a dynamic virtual node which is now gone. Ignore.
# Need to look at reload() to see if we can catch this earlier.
#
if (exists($nodes{$node})) {
handleCtrlEvent($node,$TBTIMEOUT);
}
else {
info("POP: $node is no longer in the nodes array. Skipping\n");
delete($timeout_tag{$node})
if (exists($timeout_tag{$node}));
}
if (0) { qshow(); }
if (qhead($deadline,$node)) {
$deadline=0; $node="";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment