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

diff --git a/database.py b/database.py
index 96664af..0680b6c 100644
--- a/database.py
+++ b/database.py
@@ -13,16 +13,22 @@ In order to maintain service when the node reboots during a network
 partition, the database is constantly being dumped to disk.
 """
 
+import sys
+
 import cPickle
 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 +126,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")
 
@@ -137,7 +143,7 @@ It may be necessary in the future to do something smarter."""
             # we still need the other ones to be handled
             try:
                 sliver = account.get(name)
-                logger.verbose("database: sync : looping on %s (shell account class from pwd %s)" %(name,sliver._get_class()))
+                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':
                     logger.verbose ("database: sync : ensure_create'ing 'instantiation' sliver %s"%name)
@@ -152,8 +158,10 @@ It may be necessary in the future to do something smarter."""
                     if sliver.is_running():
                         logger.verbose ("database: sync : ensure_create'ing 'delegated' sliver %s"%name)
                         sliver.ensure_created(rec)
+            except SystemExit as e:
+                sys.exit(e)
             except:
-                logger.log_exc("database: sync failed to handle sliver",name=name)
+                logger.log_exc("database: sync failed to handle sliver", name=name)
 
         # Wake up bwmom to update limits.
         bwmon.lock.set()