X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=database.py;h=ab4082448981cde9416dcfa7136841290f200106;hb=74a8cfb9d2eac39ae02e5323e1fb5b1d33297981;hp=46a4e47c6e37e5f5fd9de2dbf6953320e006ecb9;hpb=93371f5ea539ff6205f0b9f96056a484268f110c;p=nodemanager.git

diff --git a/database.py b/database.py
index 46a4e47..ab40824 100644
--- a/database.py
+++ b/database.py
@@ -1,3 +1,6 @@
+# $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.
@@ -23,7 +26,7 @@ import bwmon
 
 # 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_min': 0, 'cpu_share': 32, 'net_min_rate': 0, 'net_max_rate': 8, 'net_i2_min_rate': 0, 'net_i2_max_rate': 8, 'net_share': 1}
+MINIMUM_ALLOCATION = {'cpu_pct': 0, 'cpu_share': 1, 'net_min_rate': 0, 'net_max_rate': 8, 'net_i2_min_rate': 0, 'net_i2_max_rate': 8, 'net_share': 1}
 LOANABLE_RESOURCES = MINIMUM_ALLOCATION.keys()
 
 DB_FILE = '/root/sliver_mgr_db.pickle'
@@ -97,14 +100,36 @@ class Database(dict):
         self._compute_effective_rspecs()
 
         # create and destroy accounts as needed
+        logger.verbose("database: sync : fetching accounts")
         existing_acct_names = accounts.all()
         for name in existing_acct_names:
-            if name not in self: accounts.get(name).ensure_destroyed()
+            if name not in self: 
+                logger.verbose("database: sync : ensure_destroy'ing %s"%name)
+                accounts.get(name).ensure_destroyed()
         for name, rec in self.iteritems():
-            if rec['instantiation'] == 'plc-instantiated': accounts.get(name).ensure_created(rec)
-            if rec['instantiation'] == 'nm-controller': accounts.get(name).ensure_created(rec)
-
-		# Wake up bwmom to update limits.
+            # protect this; if anything fails for a given sliver 
+            # we still need the other ones to be handled
+            try:
+                sliver = accounts.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': 
+                    logger.verbose ("database: sync : ensure_create'ing 'instantiation' sliver %s"%name)
+                    sliver.ensure_created(rec)
+                elif rec['instantiation'] == 'nm-controller': 
+                    logger.verbose ("database: sync : ensure_create'ing 'nm-controller' sliver %s"%name)
+                    sliver.ensure_created(rec)
+                # Back door to ensure PLC overrides Ticket in delegation.
+                elif rec['instantiation'] == 'delegated' and sliver._get_class() != None:
+                    # if the ticket has been delivered and the nm-contoroller started the slice
+                    # update rspecs and keep them up to date.
+                    if sliver.is_running(): 
+                        logger.verbose ("database: sync : ensure_create'ing 'delegated' sliver %s"%name)
+                        sliver.ensure_created(rec)
+            except:
+                logger.log_exc("database: sync failed to handle sliver",name=name)
+
+        # Wake up bwmom to update limits.
         bwmon.lock.set()
         global dump_requested
         dump_requested = True
@@ -122,13 +147,16 @@ def start():
             dump_requested = False
             db_lock.release()
             try: tools.write_file(DB_FILE, lambda f: f.write(db_pickle))
-            except: logger.log_exc()
+            except: logger.log_exc("database: failed in database.start.run")
     global db
     try:
         f = open(DB_FILE)
         try: db = cPickle.load(f)
         finally: f.close()
+    except IOError:
+        logger.log ("database: Could not load %s -- starting from a fresh database"%DB_FILE)
+        db = Database()
     except:
-        logger.log_exc()
+        logger.log_exc("database: failed in start")
         db = Database()
     tools.as_daemon_thread(run)