- Cleanup of threads on bundle stop as well adjust of the logging
level during InterruptException
Change-Id: I3ae7aa5f50f76fae72c3119d00459f11ffa5a4ee
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
Thread.sleep(10);
}
} catch (InterruptedException e1) {
Thread.sleep(10);
}
} catch (InterruptedException e1) {
- logger.warn("DiscoveryTransmit interupted", e1.getMessage());
+ logger.trace("DiscoveryTransmit interupted", e1.getMessage());
if (shuttingDown) {
return;
}
if (shuttingDown) {
return;
}
Thread.sleep(100);
} catch (InterruptedException e1) {
Thread.sleep(100);
} catch (InterruptedException e1) {
- logger.warn("TopologyNotify interrupted {}",
+ logger.trace("TopologyNotify interrupted {}",
e1.getMessage());
if (shuttingDown) {
return;
e1.getMessage());
if (shuttingDown) {
return;
}
}
} catch (InterruptedException e1) {
}
}
} catch (InterruptedException e1) {
"Edge Bandwidth Utilization Notify Thread interrupted {}",
e1.getMessage());
if (shuttingDown) {
"Edge Bandwidth Utilization Notify Thread interrupted {}",
e1.getMessage());
if (shuttingDown) {
logger.debug("Bulk Notify container:{}", containerName);
TopologyBulkUpdate(containerName);
} catch (InterruptedException e) {
logger.debug("Bulk Notify container:{}", containerName);
TopologyBulkUpdate(containerName);
} catch (InterruptedException e) {
- logger.warn("Topology Bulk update thread interrupted");
+ logger.trace("Topology Bulk update thread interrupted");
protected void pollTxBitRates() {
Map<NodeConnector, Pair<Edge, Set<Property>>> globalContainerEdges = edgeMap
.get(GlobalConstants.DEFAULT.toString());
protected void pollTxBitRates() {
Map<NodeConnector, Pair<Edge, Set<Property>>> globalContainerEdges = edgeMap
.get(GlobalConstants.DEFAULT.toString());
+ if (shuttingDown) {
+ logger.trace("Getting out the pollTxBitRates because bundle going down");
+ return;
+ }
if (globalContainerEdges == null) {
return;
}
if (globalContainerEdges == null) {
return;
}
logger.trace("STOP called!");
shuttingDown = true;
notifyThread.interrupt();
logger.trace("STOP called!");
shuttingDown = true;
notifyThread.interrupt();
+ bwUtilNotifyThread.interrupt();
+ ofPluginTopoBulkUpdate.interrupt();
+ pollTimer.cancel();
}
void setTopologyServiceShimListener(Map<?, ?> props,
}
void setTopologyServiceShimListener(Map<?, ?> props,