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

diff --git a/database.py b/database.py
index 96664af..7064335 100644
--- a/database.py
+++ b/database.py
@@ -18,11 +18,15 @@ import threading
 import time
 
 import account
-import coresched
 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,8 +124,8 @@ 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")