IntentStores: clear transient states, after transitioning to parking state

Fix for ONOS-372

Change-Id: I2e397f7f9a60855945fd49a8170c41ab0166f6d3

@@ -53,6 +53,7 @@ import org.slf4j.Logger;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.EnumSet;
+import java.util.HashSet;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.Set;
 import java.util.Set;
@@ -76,6 +77,8 @@ public class DistributedIntentStore
     /** Valid parking state, which can transition to WITHDRAWN. */
     /** Valid parking state, which can transition to WITHDRAWN. */
     private static final Set<IntentState> PRE_WITHDRAWN = EnumSet.of(INSTALLED, FAILED);
     private static final Set<IntentState> PRE_WITHDRAWN = EnumSet.of(INSTALLED, FAILED);
 
 
+    private static final Set<IntentState> PARKING = EnumSet.of(SUBMITTED, INSTALLED, WITHDRAWN, FAILED);
+
     private final Logger log = getLogger(getClass());
     private final Logger log = getLogger(getClass());
 
 
     // Assumption: IntentId will not have synonyms
     // Assumption: IntentId will not have synonyms
@@ -415,6 +418,8 @@ public class DistributedIntentStore
         List<Operation> failed = new ArrayList<>();
         List<Operation> failed = new ArrayList<>();
         final Builder builder = BatchWriteRequest.newBuilder();
         final Builder builder = BatchWriteRequest.newBuilder();
 
 
+        final Set<IntentId> transitionedToParking = new HashSet<>();
+
         for (Operation op : batch.operations()) {
         for (Operation op : batch.operations()) {
             switch (op.type()) {
             switch (op.type()) {
             case CREATE_INTENT:
             case CREATE_INTENT:
@@ -440,6 +445,11 @@ public class DistributedIntentStore
                 intent = op.arg(0);
                 intent = op.arg(0);
                 IntentState newState = op.arg(1);
                 IntentState newState = op.arg(1);
                 builder.put(STATES_TABLE, strIntentId(intent.id()), serializer.encode(newState));
                 builder.put(STATES_TABLE, strIntentId(intent.id()), serializer.encode(newState));
+                if (PARKING.contains(newState)) {
+                    transitionedToParking.add(intent.id());
+                } else {
+                    transitionedToParking.remove(intent.id());
+                }
                 break;
                 break;
 
 
             case SET_INSTALLABLE:
             case SET_INSTALLABLE:
@@ -467,6 +477,7 @@ public class DistributedIntentStore
         BatchWriteResult batchWriteResult = dbService.batchWrite(builder.build());
         BatchWriteResult batchWriteResult = dbService.batchWrite(builder.build());
         if (batchWriteResult.isSuccessful()) {
         if (batchWriteResult.isSuccessful()) {
             // no-failure (except for invalid input)
             // no-failure (except for invalid input)
+            transitionedToParking.forEach((intentId) -> transientStates.remove(intentId));
             return failed;
             return failed;
         } else {
         } else {
             // everything failed
             // everything failed

@@ -76,6 +76,8 @@ public class HazelcastIntentStore
     /** Valid parking state, which can transition to WITHDRAWN. */
     /** Valid parking state, which can transition to WITHDRAWN. */
     private static final Set<IntentState> PRE_WITHDRAWN = EnumSet.of(INSTALLED, FAILED);
     private static final Set<IntentState> PRE_WITHDRAWN = EnumSet.of(INSTALLED, FAILED);
 
 
+    private static final Set<IntentState> PARKING = EnumSet.of(SUBMITTED, INSTALLED, WITHDRAWN, FAILED);
+
     private final Logger log = getLogger(getClass());
     private final Logger log = getLogger(getClass());
 
 
     // Assumption: IntentId will not have synonyms
     // Assumption: IntentId will not have synonyms
@@ -348,6 +350,8 @@ public class HazelcastIntentStore
         }
         }
     }
     }
 
 
+    // TODO slice out methods after merging Ali's patch
+    // CHECKSTYLE IGNORE MethodLength FOR NEXT 1 LINES
     @Override
     @Override
     public List<Operation> batchWrite(BatchWrite batch) {
     public List<Operation> batchWrite(BatchWrite batch) {
         // Hazelcast version will never fail for conditional failure now.
         // Hazelcast version will never fail for conditional failure now.
@@ -479,6 +483,10 @@ public class HazelcastIntentStore
 
 
                 try {
                 try {
                     IntentState prevIntentState = (IntentState) subops.get(0).get();
                     IntentState prevIntentState = (IntentState) subops.get(0).get();
+
+                    if (PARKING.contains(newState)) {
+                        transientStates.remove(intentId);
+                    }
                     log.trace("{} - {} -> {}", intentId, prevIntentState, newState);
                     log.trace("{} - {} -> {}", intentId, prevIntentState, newState);
                     // TODO sanity check and log?
                     // TODO sanity check and log?
                 } catch (InterruptedException e) {
                 } catch (InterruptedException e) {