[haizea-commit] r761 - in branches/1.1/src/haizea: core/scheduler pluggable/policies

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

Author: borja
Date: 2010-01-12 20:00:16 -0600 (Tue, 12 Jan 2010)
New Revision: 761

Modified:
   branches/1.1/src/haizea/core/scheduler/lease_scheduler.py
   branches/1.1/src/haizea/pluggable/policies/pricing.py
Log:
Minor bugs

Modified: branches/1.1/src/haizea/core/scheduler/lease_scheduler.py
===================================================================
--- branches/1.1/src/haizea/core/scheduler/lease_scheduler.py	2010-01-13 01:36:21 UTC (rev 760)
+++ branches/1.1/src/haizea/core/scheduler/lease_scheduler.py	2010-01-13 02:00:16 UTC (rev 761)
@@ -781,9 +781,10 @@
                 self.vm_scheduler.cancel_vm(preempt_vmrr)       
                 cancelled.append(lease_to_preempt.id)
                 
-                if lease_to_preempt.get_state() == Lease.STATE_SUSPENDED_SCHEDULED:
+                lease_state = lease_to_preempt.get_state()
+                if lease_state == Lease.STATE_SUSPENDED_SCHEDULED:
                     lease.set_state(Lease.STATE_SUSPENDED_READY)
-                else:
+                elif lease_state != Lease.STATE_READY:
                     lease.set_state(Lease.STATE_READY)                
 
         for lease_to_preempt in preempted_leases:

Modified: branches/1.1/src/haizea/pluggable/policies/pricing.py
===================================================================
--- branches/1.1/src/haizea/pluggable/policies/pricing.py	2010-01-13 01:36:21 UTC (rev 760)
+++ branches/1.1/src/haizea/pluggable/policies/pricing.py	2010-01-13 02:00:16 UTC (rev 761)
@@ -133,8 +133,8 @@
         lease -- Lease that is being scheduled.
         preempted_leases -- Leases that would have to be preempted to support this lease.
         """
-        rate = random.uniform(self.min_rate, self.max_rate)
-        return self.get_price(lease, rate)
+        self.rate = random.uniform(self.min_rate, self.max_rate)
+        return self.get_price(lease, preempted_leases)
     
 class MaximumPricePolicy(RatePricePolicy):
     """...