X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=database.py;h=7064335077d4b52f85707cbddbc01d00796a79d6;hb=9e6b9c1ea9e020c55c85b433bac47231d63e9ffd;hp=c990364ef6b306e1fa8c4f37d9d62ac1bc8e8fcb;hpb=d3a3b2d3ea98e72183d1cb5497c38badaa0c5863;p=nodemanager.git

diff --git a/database.py b/database.py
index c990364..7064335 100644
--- a/database.py
+++ b/database.py
@@ -1,6 +1,4 @@
-# $Id$
-# $URL$
-
+#
 """The database houses information on slivers.  This information
 reaches the sliver manager in two different ways: one, through the
 GetSlivers() call made periodically; two, by users delivering tickets.
@@ -19,11 +17,16 @@ import cPickle
 import threading
 import time
 
-import accounts
+import account
 import logger
 import tools
 import bwmon
 
+# hopefully temporary
+# is there a good reason to have this done here and not in a plugin ?
+try:    from coresched_lxc import CoreSched
+except: from coresched_vs  import CoreSched
+
 # We enforce minimum allocations to keep the clueless from hosing their slivers.
 # Disallow disk loans because there's currently no way to punish slivers over quota.
 MINIMUM_ALLOCATION = {'cpu_pct': 0,
@@ -120,18 +123,24 @@ It may be necessary in the future to do something smarter."""
 
         self._compute_effective_rspecs()
 
+        try:
+            coresched = CoreSched()
+            coresched.adjustCores(self)
+        except:
+            logger.log_exc("database: exception while doing core sched")
+
         # create and destroy accounts as needed
         logger.verbose("database: sync : fetching accounts")
-        existing_acct_names = accounts.all()
+        existing_acct_names = account.all()
         for name in existing_acct_names:
             if name not in self:
                 logger.verbose("database: sync : ensure_destroy'ing %s"%name)
-                accounts.get(name).ensure_destroyed()
+                account.get(name).ensure_destroyed()
         for name, rec in self.iteritems():
             # protect this; if anything fails for a given sliver
             # we still need the other ones to be handled
             try:
-                sliver = accounts.get(name)
+                sliver = account.get(name)
                 logger.verbose("database: sync : looping on %s (shell account class from pwd %s)" %(name,sliver._get_class()))
                 # Make sure we refresh accounts that are running
                 if rec['instantiation'] == 'plc-instantiated':