[haizea-commit] r802 - in branches/1.1/src/haizea/core: frontends scheduler scheduler/preparation_schedulers

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

Author: borja
Date: 2010-06-22 10:01:11 -0500 (Tue, 22 Jun 2010)
New Revision: 802

Modified:
   branches/1.1/src/haizea/core/frontends/tracefile.py
   branches/1.1/src/haizea/core/scheduler/preparation_schedulers/imagetransfer.py
   branches/1.1/src/haizea/core/scheduler/slottable.py
   branches/1.1/src/haizea/core/scheduler/vm_scheduler.py
Log:
More small bug fixes


Modified: branches/1.1/src/haizea/core/frontends/tracefile.py
===================================================================
--- branches/1.1/src/haizea/core/frontends/tracefile.py	2010-06-22 14:54:47 UTC (rev 801)
+++ branches/1.1/src/haizea/core/frontends/tracefile.py	2010-06-22 15:01:11 UTC (rev 802)
@@ -71,7 +71,8 @@
         memory = config.get("override-memory")
         if memory != constants.NO_MEMORY_OVERRIDE:
             for r in self.requests:
-                r.requested_resources.set_by_type(constants.RES_MEM, memory)            
+                for n in r.requested_resources:
+                    r.requested_resources[n].set_quantity(constants.RES_MEM, memory)            
             
         types = {}
         for r in self.requests:

Modified: branches/1.1/src/haizea/core/scheduler/preparation_schedulers/imagetransfer.py
===================================================================
--- branches/1.1/src/haizea/core/scheduler/preparation_schedulers/imagetransfer.py	2010-06-22 14:54:47 UTC (rev 801)
+++ branches/1.1/src/haizea/core/scheduler/preparation_schedulers/imagetransfer.py	2010-06-22 15:01:11 UTC (rev 802)
@@ -240,8 +240,8 @@
         # to add entries to the pools
         if reusealg == constants.REUSE_IMAGECACHES:
             for (vnode, pnode) in mustpool.items():
-                self.resourcepool.add_mapping_to_existing_reusable_image(pnode, lease.diskimage_id, lease.id, vnode, start)
-                self.resourcepool.add_diskimage(pnode, lease.diskimage_id, lease.diskimage_size, lease.id, vnode)
+                self.resourcepool.add_mapping_to_existing_reusable_image(pnode, lease.software.image_id, lease.id, vnode, start)
+                self.resourcepool.add_diskimage(pnode, lease.software.image_id, lease.software.image_size, lease.id, vnode)
                 
         return transfer_rrs, is_ready
 

Modified: branches/1.1/src/haizea/core/scheduler/slottable.py
===================================================================
--- branches/1.1/src/haizea/core/scheduler/slottable.py	2010-06-22 14:54:47 UTC (rev 801)
+++ branches/1.1/src/haizea/core/scheduler/slottable.py	2010-06-22 15:01:11 UTC (rev 802)
@@ -254,7 +254,7 @@
         
         if self.slottable.rtuple_has_multiinst:
             for (pos, l) in self._multi_instance.items():
-                for i, x in l:
+                for i, x in enumerate(l):
                     if l[i] < rt._multi_instance[pos][i]:
                         return True
                     
@@ -275,7 +275,7 @@
             
         if self.slottable.rtuple_has_multiinst:
             for (pos, l) in self._multi_instance.items():
-                for i, x in l:
+                for i, x in enumerate(l):
                     l[i] = min(l[i], rt._multi_instance[pos][i])
                     
     
@@ -424,11 +424,10 @@
         self.awcache = None
         self.state_stack = []
         self.__dirty()
-        
 
         # Resource tuple fields
         res_singleinstance = [rt for rt,ninst in resource_types if ninst == ResourceTuple.SINGLE_INSTANCE]
-        res_multiinstance = [(rt,ninst) for rt,ninst in resource_types if ninst == ResourceTuple.MULTI_INSTANCE]
+        res_multiinstance = [(rt,ResourceTuple.MULTI_INSTANCE) for rt,ninst in resource_types if ninst > 1 ]
         self.rtuple_nsingle = len(res_singleinstance)
         self.rtuple_nmultiple = len(res_multiinstance)
         self.rtuple_has_multiinst = self.rtuple_nmultiple > 0

Modified: branches/1.1/src/haizea/core/scheduler/vm_scheduler.py
===================================================================
--- branches/1.1/src/haizea/core/scheduler/vm_scheduler.py	2010-06-22 14:54:47 UTC (rev 801)
+++ branches/1.1/src/haizea/core/scheduler/vm_scheduler.py	2010-06-22 15:01:11 UTC (rev 802)
@@ -336,14 +336,15 @@
                     util[type(r)] = use + util.setdefault(type(r),0.0)
                 elif isinstance(r, SuspensionResourceReservation) or isinstance(r, ResumptionResourceReservation) or isinstance(r, ShutdownResourceReservation):
                     use = r.vmrr.resources_in_pnode[node].get_by_type(constants.RES_CPU)
-                    util[type(r)] = use + util.setdefault(type(r),0.0)
+                    util[type(r)] = 0.0
+                    #util[type(r)] = use + util.setdefault(type(r),0.0)
         util[None] = total - sum(util.values())
-        
+
         if total != 0:
             for k in util:
                 util[k] /= total
-            
-        return util              
+
+        return util
         
 
     def __schedule_exact(self, lease, duration, nexttime, earliest):