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

haizea-commit at mailman.cs.uchicago.edu haizea-commit at mailman.cs.uchicago.edu
Fri Jan 15 04:13:50 CST 2010


Author: borja
Date: 2010-01-15 04:13:50 -0600 (Fri, 15 Jan 2010)
New Revision: 769

Modified:
   branches/1.1/src/haizea/core/scheduler/lease_scheduler.py
   branches/1.1/src/haizea/core/scheduler/vm_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-15 09:25:21 UTC (rev 768)
+++ branches/1.1/src/haizea/core/scheduler/lease_scheduler.py	2010-01-15 10:13:50 UTC (rev 769)
@@ -889,7 +889,7 @@
                     last_vmrr = lease_to_preempt.get_last_vmrr()
                     if last_vmrr != None and last_vmrr.is_suspending():
                         override_state = Lease.STATE_SUSPENDED_PENDING
-                        earliest_time = last_vmrr.post_rrs[-1].end
+                        earliest_time = max(last_vmrr.post_rrs[-1].end, nexttime)
                     else:
                         override_state = None
                         earliest_time = nexttime

Modified: branches/1.1/src/haizea/core/scheduler/vm_scheduler.py
===================================================================
--- branches/1.1/src/haizea/core/scheduler/vm_scheduler.py	2010-01-15 09:25:21 UTC (rev 768)
+++ branches/1.1/src/haizea/core/scheduler/vm_scheduler.py	2010-01-15 10:13:50 UTC (rev 769)
@@ -675,7 +675,7 @@
                 last_vmrr = lease2.get_last_vmrr()
                 if last_vmrr != None and last_vmrr.is_suspending():
                     override_state = Lease.STATE_SUSPENDED_PENDING
-                    l_earliest_time = last_vmrr.post_rrs[-1].end
+                    l_earliest_time = max(last_vmrr.post_rrs[-1].end, earliest_time)
                 else:
                     override_state = None
                     l_earliest_time = earliest_time
@@ -815,7 +815,7 @@
             last_vmrr = l.get_last_vmrr()
             if last_vmrr != None and last_vmrr.is_suspending():
                 override_state = Lease.STATE_SUSPENDED_PENDING
-                l_earliest_time = last_vmrr.post_rrs[-1].end
+                l_earliest_time = max(last_vmrr.post_rrs[-1].end, earliest_time)
             else:
                 override_state = None
                 l_earliest_time = earliest_time



More information about the Haizea-commit mailing list