commit aae93b29b6b38ce35da74ff5e2b098abdb4db037
author Jonathan Hart <jono@onlab.us> Wed Jul 22 14:59:47 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Jul 24 16:06:35 2015 +0000
tree 73eafac674ed807490cb2d44ab59f08af87435d6
parent 585f905a739b5a699cb5133581566e817a680a79

Periodically retry failed intents.

Fixes ONOS-2433.

Ported from onos-1.2 branch.

Change-Id: I6ebd640398efe5db39fc855c406e52ce7dc539b9
(cherry picked from commit f72a631d33074d78a2ce85fac6eb10dc6c857704)

core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java
index 44a2d65..d7fa322 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java
@@ -181,7 +181,7 @@
                 service.withdraw(intentData.intent());
                 break;
             default:
-                log.warn("Trying to resubmit corrupt intent {} in state {} with request {}",
+                log.warn("Trying to resubmit corrupt/failed intent {} in state {} with request {}",
                          intentData.key(), intentData.state(), intentData.request());
                 break;
         }
@@ -203,14 +203,18 @@
     }
 
     /**
-     * Iterate through CORRUPT intents and re-submit/withdraw appropriately.
-     *
+     * Iterates through corrupt, failed and pending intents and
+     * re-submit/withdraw appropriately.
      */
     private void cleanup() {
-        int corruptCount = 0, stuckCount = 0, pendingCount = 0;
-        store.getIntentData(true, periodMs);
+        int corruptCount = 0, failedCount = 0, stuckCount = 0, pendingCount = 0;
+
         for (IntentData intentData : store.getIntentData(true, periodMs)) {
             switch (intentData.state()) {
+                case FAILED:
+                    resubmitCorrupt(intentData, false);
+                    failedCount++;
+                    break;
                 case CORRUPT:
                     resubmitCorrupt(intentData, false);
                     corruptCount++;
@@ -231,8 +235,8 @@
             stuckCount++;
         }
 
-        log.debug("Intent cleanup ran and resubmitted {} corrupt, {} stuck, and {} pending intents",
-                  corruptCount, stuckCount, pendingCount);
+        log.debug("Intent cleanup ran and resubmitted {} corrupt, {} failed, {} stuck, and {} pending intents",
+                  corruptCount, failedCount, stuckCount, pendingCount);
     }
 
     @Override