[haizea-commit] r776 - branches/1.1/src/haizea/core/scheduler

[haizea-commit at mailman.cs.uchicago.edu]

Author: borja
Date: 2010-01-15 19:48:13 -0600 (Fri, 15 Jan 2010)
New Revision: 776

Modified:
   branches/1.1/src/haizea/core/scheduler/lease_scheduler.py
Log:
Fix to bug that showed up when running Haizea with larger workloads.

Modified: branches/1.1/src/haizea/core/scheduler/lease_scheduler.py
===================================================================
--- branches/1.1/src/haizea/core/scheduler/lease_scheduler.py	2010-01-16 01:43:11 UTC (rev 775)
+++ branches/1.1/src/haizea/core/scheduler/lease_scheduler.py	2010-01-16 01:48:13 UTC (rev 776)
@@ -851,7 +851,14 @@
                     durs[lease_to_preempt] = lease_to_preempt.get_remaining_duration_at(preempt_vmrr.start)             
                     
                     lease_to_preempt.remove_vmrr(preempt_vmrr)
+                    self.vm_scheduler.cancel_vm(preempt_vmrr)
 
+                    # Cancel future VMs
+                    for after_vmrr in after_vmrrs:
+                        lease_to_preempt.remove_vmrr(after_vmrr)
+                        self.vm_scheduler.cancel_vm(after_vmrr)                   
+                    after_vmrrs=[]
+
                     if preempt_vmrr.state == ResourceReservation.STATE_ACTIVE:
                         last_vmrr = lease_to_preempt.get_last_vmrr()
                         if last_vmrr != None and last_vmrr.is_suspending():