Bug fix: make sure that divisor is non-zero value
Change-Id: I7214ebf552ba60db149db2b4edbb90f59d3bdd16
diff --git a/providers/openflow/message/src/main/java/org/onosproject/provider/of/message/impl/OpenFlowControlMessageAggregator.java b/providers/openflow/message/src/main/java/org/onosproject/provider/of/message/impl/OpenFlowControlMessageAggregator.java
index 0ce4ce7..e3bd78e 100644
--- a/providers/openflow/message/src/main/java/org/onosproject/provider/of/message/impl/OpenFlowControlMessageAggregator.java
+++ b/providers/openflow/message/src/main/java/org/onosproject/provider/of/message/impl/OpenFlowControlMessageAggregator.java
@@ -28,6 +28,7 @@
import org.onosproject.net.DeviceId;
import org.projectfloodlight.openflow.protocol.OFMessage;
import org.projectfloodlight.openflow.protocol.OFType;
+import org.slf4j.Logger;
import java.util.ArrayList;
import java.util.Collection;
@@ -36,12 +37,15 @@
import java.util.Set;
import static org.onosproject.provider.of.message.impl.OpenFlowControlMessageMapper.lookupControlMessageType;
+import static org.slf4j.LoggerFactory.getLogger;
/**
* Collects the OpenFlow messages and aggregates using MetricsService.
*/
public class OpenFlowControlMessageAggregator implements Runnable {
+ private final Logger log = getLogger(getClass());
+
private static final Set<OFType> OF_TYPE_SET =
ImmutableSet.of(OFType.PACKET_IN, OFType.PACKET_OUT, OFType.FLOW_MOD,
OFType.FLOW_REMOVED, OFType.STATS_REQUEST, OFType.STATS_REPLY);
@@ -103,8 +107,10 @@
new DefaultControlMessage(lookupControlMessageType(type),
getLoad(type), getRate(type), getCount(type),
System.currentTimeMillis())));
+ log.debug("sent aggregated control message");
providerService.updateStatsInfo(deviceId,
Collections.unmodifiableCollection(controlMessages));
+ controlMessages.clear();
}
/**
@@ -114,8 +120,11 @@
* @return load value
*/
private long getLoad(OFType type) {
+ if (countMeterMap.get(type).getOneMinuteRate() == 0D) {
+ return 0L;
+ }
return (long) rateMeterMap.get(type).getOneMinuteRate() /
- (long) countMeterMap.get(type).getOneMinuteRate();
+ (long) countMeterMap.get(type).getOneMinuteRate();
}
/**
diff --git a/providers/openflow/message/src/main/java/org/onosproject/provider/of/message/impl/OpenFlowControlMessageProvider.java b/providers/openflow/message/src/main/java/org/onosproject/provider/of/message/impl/OpenFlowControlMessageProvider.java
index 8c9e160..93aa70f 100644
--- a/providers/openflow/message/src/main/java/org/onosproject/provider/of/message/impl/OpenFlowControlMessageProvider.java
+++ b/providers/openflow/message/src/main/java/org/onosproject/provider/of/message/impl/OpenFlowControlMessageProvider.java
@@ -106,7 +106,7 @@
controller.getSwitches().forEach(sw -> sw.addEventListener(outMsgListener));
executor = Executors.newSingleThreadScheduledExecutor(
- groupedThreads("onos/provider", "aggregator"));
+ groupedThreads("onos/provider", "aggregator"));
connectInitialDevices();
log.info("Started");