X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=database.py;h=7e75d5568c5a165873470951c917378c5aca43d5;hb=f39100f35e48369b47cab7dd85918dc948f2af44;hp=be304d303b9eee29387c6dec6ed310b5cdcf74e8;hpb=73ac7b040f2f78973727c592dd3facfccb618a6c;p=nodemanager.git

diff --git a/database.py b/database.py
index be304d3..7e75d55 100644
--- a/database.py
+++ b/database.py
@@ -23,7 +23,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,17 +97,25 @@ 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:
+            logger.verbose("database:sync : loop on %s"%name)
             if name not in self: 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)
-
-        #try: bwmon.GetSlivers(self)
-        #except: logger.log_exc()
+            slivr = accounts.get(name)
+            logger.verbose("database:sync : %s is %s" %(name,slivr._get_class()))
+            # Make sure we refresh accounts that are running
+            if rec['instantiation'] == 'plc-instantiated': slivr.ensure_created(rec)
+            elif rec['instantiation'] == 'nm-controller': slivr.ensure_created(rec)
+            # Back door to ensure PLC overrides Ticket in delegation.
+            elif rec['instantiation'] == 'delegated' and slivr._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 slivr.is_running(): slivr.ensure_created(rec)
+
+        # Wake up bwmom to update limits.
         bwmon.lock.set()
-        # request a database dump
         global dump_requested
         dump_requested = True
         db_cond.notify()