initial Distributed IntentStore using Hz
Change-Id: Iffb3f5fdfe8ba080fd039e67f8473ea18348f20d
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentStore.java b/core/api/src/main/java/org/onlab/onos/net/intent/IntentStore.java
index f0e11f1..a2248a2 100644
--- a/core/api/src/main/java/org/onlab/onos/net/intent/IntentStore.java
+++ b/core/api/src/main/java/org/onlab/onos/net/intent/IntentStore.java
@@ -86,13 +86,13 @@
IntentEvent setState(Intent intent, IntentState newState);
/**
- * Adds the installable intents which resulted from compilation of the
+ * Sets the installable intents which resulted from compilation of the
* specified original intent.
*
* @param intentId original intent identifier
* @param installableIntents compiled installable intents
*/
- void addInstallableIntents(IntentId intentId, List<Intent> installableIntents);
+ void setInstallableIntents(IntentId intentId, List<Intent> installableIntents);
/**
* Returns the list of the installable events associated with the specified
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java
index eabee80..7b1d7a9 100644
--- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java
+++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java
@@ -273,7 +273,7 @@
// If all went well, associate the resulting list of installable
// intents with the top-level intent and proceed to install.
- store.addInstallableIntents(intent.id(), installable);
+ store.setInstallableIntents(intent.id(), installable);
executeInstallingPhase(intent);
} catch (Exception e) {
@@ -366,7 +366,7 @@
} else {
// Otherwise, re-associate the newly compiled installable intents
// with the top-level intent and kick off installing phase.
- store.addInstallableIntents(intent.id(), installable);
+ store.setInstallableIntents(intent.id(), installable);
executeInstallingPhase(intent);
}
} catch (Exception e) {
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/DistributedIntentStore.java b/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/DistributedIntentStore.java
index ab41805..eb6feb1 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/DistributedIntentStore.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/DistributedIntentStore.java
@@ -16,6 +16,8 @@
package org.onlab.onos.store.intent.impl;
import com.google.common.collect.ImmutableSet;
+import com.hazelcast.core.IMap;
+
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
@@ -26,30 +28,54 @@
import org.onlab.onos.net.intent.IntentState;
import org.onlab.onos.net.intent.IntentStore;
import org.onlab.onos.net.intent.IntentStoreDelegate;
-import org.onlab.onos.store.AbstractStore;
+import org.onlab.onos.store.hz.AbstractHazelcastStore;
+import org.onlab.onos.store.hz.SMap;
import org.slf4j.Logger;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import static com.google.common.base.Verify.verify;
import static org.onlab.onos.net.intent.IntentState.*;
import static org.slf4j.LoggerFactory.getLogger;
-//FIXME: I LIE I AM NOT DISTRIBUTED
@Component(immediate = true)
@Service
public class DistributedIntentStore
- extends AbstractStore<IntentEvent, IntentStoreDelegate>
+ extends AbstractHazelcastStore<IntentEvent, IntentStoreDelegate>
implements IntentStore {
private final Logger log = getLogger(getClass());
- private final Map<IntentId, Intent> intents = new ConcurrentHashMap<>();
- private final Map<IntentId, IntentState> states = new ConcurrentHashMap<>();
- private final Map<IntentId, List<Intent>> installable = new ConcurrentHashMap<>();
+ // Assumption: IntentId will not have synonyms
+ private SMap<IntentId, Intent> intents;
+ private SMap<IntentId, IntentState> states;
+
+ // Map to store instance local intermediate state transition
+ private transient Map<IntentId, IntentState> transientStates = new ConcurrentHashMap<>();
+
+ private SMap<IntentId, List<Intent>> installable;
+
+ @Override
@Activate
public void activate() {
+ super.activate();
+
+ // TODO: enable near cache, allow read from backup for this IMap
+ IMap<byte[], byte[]> rawIntents = super.theInstance.getMap("intents");
+ intents = new SMap<>(rawIntents , super.serializer);
+
+ // TODO: disable near cache, disable read from backup for this IMap
+ IMap<byte[], byte[]> rawStates = super.theInstance.getMap("intent-states");
+ states = new SMap<>(rawStates , super.serializer);
+
+ transientStates.clear();
+
+ // TODO: disable near cache, disable read from backup for this IMap
+ IMap<byte[], byte[]> rawInstallables = super.theInstance.getMap("installable-intents");
+ installable = new SMap<>(rawInstallables , super.serializer);
+
log.info("Started");
}
@@ -60,16 +86,27 @@
@Override
public IntentEvent createIntent(Intent intent) {
- intents.put(intent.id(), intent);
- return this.setState(intent, IntentState.SUBMITTED);
+ Intent existing = intents.putIfAbsent(intent.id(), intent);
+ if (existing != null) {
+ // duplicate, ignore
+ return null;
+ } else {
+ return this.setState(intent, IntentState.SUBMITTED);
+ }
}
@Override
public IntentEvent removeIntent(IntentId intentId) {
Intent intent = intents.remove(intentId);
installable.remove(intentId);
+ if (intent == null) {
+ // was already removed
+ return null;
+ }
IntentEvent event = this.setState(intent, WITHDRAWN);
states.remove(intentId);
+ transientStates.remove(intentId);
+ // TODO: Should we callremoveInstalledIntents if this Intent was
return event;
}
@@ -90,31 +127,53 @@
@Override
public IntentState getIntentState(IntentId id) {
+ final IntentState localState = transientStates.get(id);
+ if (localState != null) {
+ return localState;
+ }
return states.get(id);
}
@Override
public IntentEvent setState(Intent intent, IntentState state) {
- IntentId id = intent.id();
- states.put(id, state);
+ final IntentId id = intent.id();
IntentEvent.Type type = null;
+ IntentState prev = null;
+ boolean transientStateChangeOnly = false;
+ // TODO: enable sanity checking if Debug enabled, etc.
switch (state) {
case SUBMITTED:
+ prev = states.putIfAbsent(id, SUBMITTED);
+ verify(prev == null, "Illegal state transition attempted from %s to SUBMITTED", prev);
type = IntentEvent.Type.SUBMITTED;
break;
case INSTALLED:
+ // parking state transition
+ prev = states.replace(id, INSTALLED);
+ verify(prev != null, "Illegal state transition attempted from non-SUBMITTED to INSTALLED");
type = IntentEvent.Type.INSTALLED;
break;
case FAILED:
+ prev = states.replace(id, FAILED);
type = IntentEvent.Type.FAILED;
break;
case WITHDRAWN:
+ prev = states.replace(id, WITHDRAWN);
+ verify(prev != null, "Illegal state transition attempted from non-WITHDRAWING to WITHDRAWN");
type = IntentEvent.Type.WITHDRAWN;
break;
default:
+ transientStateChangeOnly = true;
break;
}
+ if (!transientStateChangeOnly) {
+ log.debug("Parking State change: {} {}=>{}", id, prev, state);
+ }
+ // Update instance local state, which includes non-parking state transition
+ prev = transientStates.put(id, state);
+ log.debug("Transient State change: {} {}=>{}", id, prev, state);
+
if (type == null) {
return null;
}
@@ -122,7 +181,7 @@
}
@Override
- public void addInstallableIntents(IntentId intentId, List<Intent> result) {
+ public void setInstallableIntents(IntentId intentId, List<Intent> result) {
installable.put(intentId, result);
}
@@ -136,4 +195,5 @@
installable.remove(intentId);
}
+ // FIXME add handler to react to remote event
}
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleIntentStore.java b/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleIntentStore.java
index bc65714..c28adf5 100644
--- a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleIntentStore.java
+++ b/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleIntentStore.java
@@ -68,6 +68,10 @@
public IntentEvent removeIntent(IntentId intentId) {
Intent intent = intents.remove(intentId);
installable.remove(intentId);
+ if (intent == null) {
+ // was already removed
+ return null;
+ }
IntentEvent event = this.setState(intent, WITHDRAWN);
states.remove(intentId);
return event;
@@ -122,7 +126,7 @@
}
@Override
- public void addInstallableIntents(IntentId intentId, List<Intent> result) {
+ public void setInstallableIntents(IntentId intentId, List<Intent> result) {
installable.put(intentId, result);
}