scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-10-31 02:27:49 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

[WIFI-7888] Add concurrent burst config handling in opensync gateway

Browse Source
This commit is contained in:
ralphlee
2022-05-11 15:43:39 -04:00
parent 4b6a18df9f
commit 1db594b656
2 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OvsdbSession.java vendored
View File

@@ -1,5 +1,7 @@
package com.telecominfraproject.wlan.opensync.external.integration;
import java.util.concurrent.atomic.AtomicInteger;
import com.vmware.ovsdb.service.OvsdbClient;
public class OvsdbSession {
@@ -7,6 +9,7 @@ public class OvsdbSession {
private String apId;
private long routingId;
private long equipmentId;
private AtomicInteger currentConfigNumInFlight = new AtomicInteger();
public OvsdbClient getOvsdbClient() {
return ovsdbClient;
@@ -32,5 +35,9 @@ public class OvsdbSession {
public void setEquipmentId(long equipmentId) {
this.equipmentId = equipmentId;
}
public AtomicInteger getCurrentConfigNumInFlight() {
return currentConfigNumInFlight;
}
}

71
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java
View File

@@ -440,29 +440,56 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
OvsdbClient ovsdbClient = ovsdbSession.getOvsdbClient();
OpensyncAPConfig opensyncAPConfig = extIntegrationInterface.getApConfig(apId);
if (opensyncAPConfig == null) {
LOG.warn("AP with id " + apId + " does not have a config to apply.");
return;
int currentConfigCount = ovsdbSession.getCurrentConfigNumInFlight().get();
if (currentConfigCount == 0L) {
// Current count is 0, start this config push
// Increment other incoming configs into the count until this config push is done
currentConfigCount = ovsdbSession.getCurrentConfigNumInFlight().incrementAndGet();
do {
try {
OpensyncAPConfig opensyncAPConfig = extIntegrationInterface.getApConfig(apId);
if (opensyncAPConfig == null) {
LOG.warn("AP with id " + apId + " does not have a config to apply.");
return;
}
//get last known configVersion from the AP
long configVersionFromAp = checkBeforePushConfigVersionFromAp ? ovsdbDao.getConfigVersionFromNode(ovsdbClient) : 0;
//get last known configVersion from the EquipmentProtocolStatusData
long configVersionFromStatus = checkBeforePushConfigVersionFromStatus ? extIntegrationInterface.getConfigVersionFromStatus(apId) : 0;
//get current configVersion from the profiles and equipment
long configVersionFromProfiles = opensyncAPConfig.getConfigVersion();
boolean needToPushConfigToAP = needToPushToAp(configVersionFromAp, configVersionFromStatus, configVersionFromProfiles);
if(needToPushConfigToAP) {
pushConfigToAp(ovsdbClient, opensyncAPConfig, apId, configVersionFromProfiles);
}
LOG.debug("Finished processConfigChanged for {}", apId);
} catch (Exception ex) {
// If anything fails in the ovsdb config push, clean up count and exit
ovsdbSession.getCurrentConfigNumInFlight().set(0);
return;
}
int checkCount = ovsdbSession.getCurrentConfigNumInFlight().get();
if (checkCount == currentConfigCount) {
// Count didn't change from pre-config push, we can clean up and exit
if (ovsdbSession.getCurrentConfigNumInFlight().compareAndSet(currentConfigCount, 0)) {
return;
}
} else {
// Count has changed, update the currentConfigCount and rerun config push
ovsdbSession.getCurrentConfigNumInFlight().incrementAndGet();
}
} while (ovsdbSession.getCurrentConfigNumInFlight().get() != 0);
} else {
// Count is not 0, another request is being processed for this OvsdbSession
// Remember this request, and the other thread will check the count when it's done
ovsdbSession.getCurrentConfigNumInFlight().incrementAndGet();
}
//get last known configVersion from the AP
long configVersionFromAp = checkBeforePushConfigVersionFromAp ? ovsdbDao.getConfigVersionFromNode(ovsdbClient) : 0;
//get last known configVersion from the EquipmentProtocolStatusData
long configVersionFromStatus = checkBeforePushConfigVersionFromStatus ? extIntegrationInterface.getConfigVersionFromStatus(apId) : 0;
//get current configVersion from the profiles and equipment
long configVersionFromProfiles = opensyncAPConfig.getConfigVersion();
boolean needToPushConfigToAP = needToPushToAp(configVersionFromAp, configVersionFromStatus, configVersionFromProfiles);
if(needToPushConfigToAP) {
pushConfigToAp(ovsdbClient, opensyncAPConfig, apId, configVersionFromProfiles);
}
LOG.debug("Finished processConfigChanged for {}", apId);
}
@Override