mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-05 04:06:49 +02:00
Code Issues Projects Releases Wiki Activity

Fix: resolve exception during vtap and telemetry app deactivation

Browse Source 
Change-Id: I7b0f00467759bec1f6344e75d0c0ef40b13e5dd7
This commit is contained in:
Jian Li 2018-07-22 11:53:57 +09:00
parent 95e5afdf38
commit bd295cd1cd
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/StatsFlowRuleManager.java
View File

@ -28,7 +28,6 @@ import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
import org.onlab.util.SharedScheduledExecutorService;
import org.onlab.util.SharedScheduledExecutors;
import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.core.ApplicationId;
@ -180,7 +179,6 @@ public class StatsFlowRuleManager implements StatsFlowRuleAdminService {
private ApplicationId appId;
private TelemetryCollector collector;
private SharedScheduledExecutorService executor;
private ScheduledFuture result;
private final Set<FlowInfo> gFlowInfoSet = Sets.newHashSet();
@ -196,21 +194,17 @@ public class StatsFlowRuleManager implements StatsFlowRuleAdminService {
@Activate
protected void activate() {
appId = coreService.registerApplication(OPENSTACK_TELEMETRY_APP_ID);
componentConfigService.registerProperties(getClass());
executor = SharedScheduledExecutors.getSingleThreadExecutor();
this.start();
start();
log.info("Started");
}
@Deactivate
protected void deactivate() {
componentConfigService.unregisterProperties(getClass(), false);
flowRuleService.removeFlowRulesById(appId);
stop();
log.info("Stopped");
}
@ -227,7 +221,8 @@ public class StatsFlowRuleManager implements StatsFlowRuleAdminService {
log.info("Start publishing thread");
collector = new TelemetryCollector();
result = executor.scheduleAtFixedRate(collector, INITIAL_DELAY,
result = SharedScheduledExecutors.getSingleThreadExecutor()
.scheduleAtFixedRate(collector, INITIAL_DELAY,
REFRESH_INTERVAL, TIME_UNIT_SECOND, RECOVER_FROM_FAILURE);
}

2
apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/OpenstackVtapManager.java
View File

@ -505,7 +505,7 @@ public class OpenstackVtapManager
}
}
flowRuleService.removeFlowRules((FlowRule[]) purgedRules.toArray());
flowRuleService.removeFlowRules(purgedRules.toArray(new FlowRule[0]));
groupService.getGroups(deviceId, appId).forEach(group -> {
groupService.removeGroup(deviceId, group.appCookie(), appId);