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

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

Author: borja
Date: 2010-07-28 17:32:18 -0500 (Wed, 28 Jul 2010)
New Revision: 837

Modified:
   branches/1.1/src/haizea/core/scheduler/vm_scheduler.py
Log:
Suspend/Resume RRs should consume CPU


Modified: branches/1.1/src/haizea/core/scheduler/vm_scheduler.py
===================================================================
--- branches/1.1/src/haizea/core/scheduler/vm_scheduler.py	2010-07-28 22:31:07 UTC (rev 836)
+++ branches/1.1/src/haizea/core/scheduler/vm_scheduler.py	2010-07-28 22:32:18 UTC (rev 837)
@@ -1159,11 +1159,13 @@
             all_vnodes = []
             for (pnode,vnodes) in node_mappings.items():
                 num_vnodes = len(vnodes)
-                r = Capacity([constants.RES_MEM,constants.RES_DISK])
+                r = Capacity([constants.RES_CPU, constants.RES_MEM,constants.RES_DISK])
                 mem = 0
                 for vnode in vnodes:
                     mem += vmrr.lease.requested_resources[vnode].get_quantity(constants.RES_MEM)
-                #r.set_quantity(constants.RES_CPU, 100) # TODO: Need to get the same quantity as pnode
+                r.set_ninstances(constants.RES_CPU, num_vnodes)
+                for i in xrange(num_vnodes):
+                    r.set_quantity_instance(constants.RES_CPU, i +1, 100)
                 r.set_quantity(constants.RES_MEM, mem * num_vnodes)
                 r.set_quantity(constants.RES_DISK, mem * num_vnodes)
                 suspres[pnode] = self.slottable.create_resource_tuple_from_capacity(r)          
@@ -1220,11 +1222,13 @@
             all_vnodes = []
             for (pnode,vnodes) in node_mappings.items():
                 num_vnodes = len(vnodes)
-                r = Capacity([constants.RES_MEM,constants.RES_DISK])
+                r = Capacity([constants.RES_CPU, constants.RES_MEM, constants.RES_DISK])
                 mem = 0
                 for vnode in vnodes:
                     mem += vmrr.lease.requested_resources[vnode].get_quantity(constants.RES_MEM)
-                #r.set_quantity(constants.RES_CPU, 100) # TODO: Need to get the same quantity as pnode                    
+                r.set_ninstances(constants.RES_CPU, num_vnodes)
+                for i in xrange(num_vnodes):
+                    r.set_quantity_instance(constants.RES_CPU, i +1, 100)
                 r.set_quantity(constants.RES_MEM, mem * num_vnodes)
                 r.set_quantity(constants.RES_DISK, mem * num_vnodes)
                 resmres[pnode] = self.slottable.create_resource_tuple_from_capacity(r)