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

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

Author: borja
Date: 2010-01-15 19:49:02 -0600 (Fri, 15 Jan 2010)
New Revision: 777

Modified:
   branches/1.1/src/haizea/core/scheduler/lease_scheduler.py
Log:
This kludge is no longer necessary now that we handle premature ends more sanely.

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:48:13 UTC (rev 776)
+++ branches/1.1/src/haizea/core/scheduler/lease_scheduler.py	2010-01-16 01:49:02 UTC (rev 777)
@@ -893,11 +893,6 @@
             earliest = {}
    
             try:
-                # Kludge: so scheduler will schedule taking into account the remaining
-                # duration at the time of the preempt, not right now.
-                #orig_accduration = lease.duration.accumulated
-                #lease.duration.accumulated = lease.duration.requested - dur
-                
                 if lease_to_preempt.id in cancelled:
                     last_vmrr = lease_to_preempt.get_last_vmrr()
                     if last_vmrr != None and last_vmrr.is_suspending():
@@ -913,8 +908,6 @@
                     for node in node_ids:
                         earliest[node] = EarliestStartingTime(preemption_time, EarliestStartingTime.EARLIEST_NOPREPARATION)                
                     (new_vmrr, preemptions) = self.vm_scheduler.reschedule_deadline(lease_to_preempt, dur, nexttime, earliest, override_state = Lease.STATE_SUSPENDED_PENDING)
-
-                #lease.duration.accumulated = orig_accduration
     
                 # Add VMRR to lease
                 lease_to_preempt.append_vmrr(new_vmrr)