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

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

Author: borja
Date: 2010-01-20 20:40:28 -0600 (Wed, 20 Jan 2010)
New Revision: 785

Modified:
   branches/1.1/src/haizea/core/scheduler/vm_scheduler.py
Log:
Fixed: When rescheduling, can't schedule earlier than the requested start time

Modified: branches/1.1/src/haizea/core/scheduler/vm_scheduler.py
===================================================================
--- branches/1.1/src/haizea/core/scheduler/vm_scheduler.py	2010-01-20 22:23:24 UTC (rev 784)
+++ branches/1.1/src/haizea/core/scheduler/vm_scheduler.py	2010-01-21 02:40:28 UTC (rev 785)
@@ -704,7 +704,7 @@
                     l_earliest_time = earliest_time
                     
                 for n in earliest:
-                    earliest[n].time = l_earliest_time
+                    earliest[n].time = max(lease2.start.requested, l_earliest_time)
                     
                 self.logger.debug("Rescheduling lease %s" % lease2.id)
                 dur = lease2.get_remaining_duration_at(l_earliest_time)                
@@ -850,7 +850,7 @@
                 l_earliest_time = earliest_time
                 
             for n in earliest:
-                earliest[n].time = l_earliest_time
+                earliest[n].time = max(l.start.requested, l_earliest_time)
                 
             self.logger.debug("Rescheduling lease %s" % l.id)
             dur = l.get_remaining_duration_at(l_earliest_time)