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

[Falcon] Fixed to avoid exception cases for compute node bootstrap

Browse Source 
- Handled network config event with thread
- Considered ONOS restart situation, where node state in the store
is not the same as real state

Change-Id: Iec8c063317f1292052f299b680b7944821e60b7f
This commit is contained in:
Hyunsun Moon 2015-12-16 14:29:36 -08:00 committed by Gerrit Code Review
parent 3564a8c8fe
commit baf705480d
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/cordvtn/src/main/java/org/onosproject/cordvtn/CordVtn.java
View File

@ -264,13 +264,7 @@ public class CordVtn implements CordVtnService {
return;
}
NodeState state = getNodeState(node);
if (state == null) {
return;
} else if (state.equals(NodeState.INCOMPLETE)) {
state = checkNodeState(node);
}
NodeState state = checkNodeState(node);
state.process(this, node);
}

13
apps/cordvtn/src/main/java/org/onosproject/cordvtn/CordVtnConfigManager.java
View File

@ -30,6 +30,10 @@ import org.onosproject.net.config.NetworkConfigService;
import org.onosproject.net.config.basics.SubjectFactories;
import org.slf4j.Logger;
import java.util.concurrent.ExecutorService;
import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
import static org.onlab.util.Tools.groupedThreads;
import static org.slf4j.LoggerFactory.getLogger;
/**
@ -63,13 +67,15 @@ public class CordVtnConfigManager {
};
private final NetworkConfigListener configListener = new InternalConfigListener();
private ApplicationId appId;
protected ExecutorService eventExecutor;
@Activate
protected void active() {
appId = coreService.getAppId(CordVtnService.CORDVTN_APP_ID);
eventExecutor = newSingleThreadScheduledExecutor(groupedThreads("onos/cordvtncfg", "event-handler"));
configService.addListener(configListener);
configRegistry.registerConfigFactory(configFactory);
}
@ -78,6 +84,7 @@ public class CordVtnConfigManager {
protected void deactivate() {
configRegistry.unregisterConfigFactory(configFactory);
configService.removeListener(configListener);
eventExecutor.shutdown();
}
private void readConfiguration() {
@ -106,11 +113,11 @@ public class CordVtnConfigManager {
switch (event.type()) {
case CONFIG_ADDED:
log.info("Network configuration added");
readConfiguration();
eventExecutor.execute(CordVtnConfigManager.this::readConfiguration);
break;
case CONFIG_UPDATED:
log.info("Network configuration updated");
readConfiguration();
eventExecutor.execute(CordVtnConfigManager.this::readConfiguration);
break;
default:
break;