Merge branch 'ipv6'

[nodemanager.git] / database.py

diff --git a/database.py b/database.py
index 020fd25..7064335 100644 (file)
--- a/database.py
+++ b/database.py
@@ -17,12 +17,16 @@ import cPickle
 import threading
 import time
 
-import accounts
-import coresched
+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,23 +124,23 @@ It may be necessary in the future to do something smarter."""
         self._compute_effective_rspecs()
 
         try:
-            x = coresched.CoreSched()
-            x.adjustCores(self)
+            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':