From: smbaker <smbaker@fc8clean.lan>
Date: Thu, 10 Nov 2011 02:12:03 +0000 (-0800)
Subject: fix bug in name lookup of memory reservation
X-Git-Tag: lxcbuild^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=067abb138667e15c83204ce4a46814fb5e7b1993;p=nodemanager.git

fix bug in name lookup of memory reservation
---

diff --git a/coresched.py b/coresched.py
index a689a68..3954da9 100644
--- a/coresched.py
+++ b/coresched.py
@@ -211,7 +211,7 @@ class CoreSched:
 
             if reservations.get(name,[]) != []:
                 reservations[name] = reservations[name] + reservations["_default"]
-                mem_reservations[name] = mem_reservations[name] + mem_reservations["_default"]
+                mem_reservations[name] = mem_reservations.get(name,[]) + mem_reservations["_default"]
                 logger.log("CoreSched: adding besteffort units to " + name + ". new units = " + str(reservations[name]))
 
         self.reserveUnits(self.cgroup_var_name, reservations)
@@ -375,5 +375,7 @@ if __name__=="__main__":
 
     slivers = {"arizona_beta": rec_sl_test1, "arizona_test101": rec_sl_test2, "pl_sirius": rec_sl_test3}
 
+    #slivers = {"arizona_beta": rec_sl_test1, "arizona_logmon": rec_sl_test2, "arizona_owl": rec_sl_test3}
+
     x.adjustCores(slivers)