fix for a failed sub batch

Change-Id: Ie686efd41a6815f913e06d1167f2282334a98ecb

@@ -401,7 +401,7 @@ public class FlowRuleManager
             CompletedBatchOperation completed;
             CompletedBatchOperation completed;
             for (Future<CompletedBatchOperation> future : futures) {
             for (Future<CompletedBatchOperation> future : futures) {
                 completed = future.get();
                 completed = future.get();
-                success = validateBatchOperation(failed, completed, future);
+                success = validateBatchOperation(failed, completed);
             }
             }
 
 
             return finalizeBatchOperation(success, failed);
             return finalizeBatchOperation(success, failed);
@@ -426,14 +426,13 @@ public class FlowRuleManager
                 long now = System.nanoTime();
                 long now = System.nanoTime();
                 long thisTimeout = end - now;
                 long thisTimeout = end - now;
                 completed = future.get(thisTimeout, TimeUnit.NANOSECONDS);
                 completed = future.get(thisTimeout, TimeUnit.NANOSECONDS);
-                success = validateBatchOperation(failed, completed, future);
+                success = validateBatchOperation(failed, completed);
             }
             }
             return finalizeBatchOperation(success, failed);
             return finalizeBatchOperation(success, failed);
         }
         }
 
 
         private boolean validateBatchOperation(List<FlowEntry> failed,
         private boolean validateBatchOperation(List<FlowEntry> failed,
-                CompletedBatchOperation completed,
-                Future<CompletedBatchOperation> future) {
+                CompletedBatchOperation completed) {
 
 
             if (isCancelled()) {
             if (isCancelled()) {
                 throw new CancellationException();
                 throw new CancellationException();

@@ -62,6 +62,7 @@ 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;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutionException;
@@ -166,7 +167,14 @@ public class OpenFlowRuleProvider extends AbstractProvider implements FlowRulePr
             FlowRule flowRule = fbe.getTarget();
             FlowRule flowRule = fbe.getTarget();
             OpenFlowSwitch sw = controller.getSwitch(Dpid.dpid(flowRule.deviceId().uri()));
             OpenFlowSwitch sw = controller.getSwitch(Dpid.dpid(flowRule.deviceId().uri()));
             if (sw == null) {
             if (sw == null) {
-                log.warn("WTF {}", flowRule.deviceId());
+                /*
+                 * if a switch we are supposed to install to is gone then
+                 * cancel (ie. rollback) the work that has been done so far
+                 * and return the associated future.
+                 */
+                InstallationFuture failed = new InstallationFuture(sws, fmXids);
+                failed.cancel(true);
+                return failed;
             }
             }
             sws.add(new Dpid(sw.getId()));
             sws.add(new Dpid(sw.getId()));
             FlowModBuilder builder = new FlowModBuilder(flowRule, sw.factory());
             FlowModBuilder builder = new FlowModBuilder(flowRule, sw.factory());
@@ -377,7 +385,7 @@ public class OpenFlowRuleProvider extends AbstractProvider implements FlowRulePr
 
 
 
 
         public void satisfyRequirement(Dpid dpid) {
         public void satisfyRequirement(Dpid dpid) {
-            log.warn("Satisfaction from switch {}", dpid);
+            log.debug("Satisfaction from switch {}", dpid);
             removeRequirement(dpid);
             removeRequirement(dpid);
         }
         }
 
 
@@ -432,7 +440,6 @@ public class OpenFlowRuleProvider extends AbstractProvider implements FlowRulePr
                 throws InterruptedException, ExecutionException,
                 throws InterruptedException, ExecutionException,
                 TimeoutException {
                 TimeoutException {
             if (countDownLatch.await(timeout, unit)) {
             if (countDownLatch.await(timeout, unit)) {
-
                 this.state = BatchState.FINISHED;
                 this.state = BatchState.FINISHED;
                 return new CompletedBatchOperation(ok.get(), offendingFlowMods);
                 return new CompletedBatchOperation(ok.get(), offendingFlowMods);
             }
             }