Moved the initialization of the ArpCache to ProxyArpManager's startUp method.
We have a timing issue with the initialization of the hazelcast instances when
running hazelcast as the datastore. The instance is started by the notificaiton
framwork relatively late (during the startUp method). The datastore needs to
connect to this instance and can be initialized earlier with unlucky timing.
This is a workaround to make the ArpCache initialize its datastore during the
startUp method, so hopefully this happens after the notification framework's
startUp method has been called.
Change-Id: Ie3bdc473630c64bfa912688747988a31db3fee72
diff --git a/src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java b/src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java
index 503bf30..7ee498a 100644
--- a/src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java
+++ b/src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java
@@ -367,17 +367,6 @@
this.onosDeviceService = context.getServiceImpl(IOnosDeviceService.class);
Map<String, String> configOptions = context.getConfigParams(this);
- Long agingmsec = null;
- try {
- agingmsec = Long.parseLong(configOptions.get("agingmsec"));
- } catch (NumberFormatException e) {
- log.debug("ArpEntryTimeout related config options were not set. Use default.");
- }
-
- arpCache = new ArpCache();
- if (agingmsec != null) {
- arpCache.setArpEntryTimeoutConfig(agingmsec);
- }
try {
arpCleaningTimerPeriodConfig = Long.parseLong(configOptions.get("cleanupmsec"));
@@ -391,6 +380,20 @@
@Override
public void startUp(FloodlightModuleContext context) {
+ Map<String, String> configOptions = context.getConfigParams(this);
+
+ Long agingmsec = null;
+ try {
+ agingmsec = Long.parseLong(configOptions.get("agingmsec"));
+ } catch (NumberFormatException e) {
+ log.debug("ArpEntryTimeout related config options were not set. Use default.");
+ }
+
+ arpCache = new ArpCache();
+ if (agingmsec != null) {
+ arpCache.setArpEntryTimeoutConfig(agingmsec);
+ }
+
this.vlan = configService.getVlan();
log.info("vlan set to {}", this.vlan);