X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=database.py;fp=database.py;h=7e75d5568c5a165873470951c917378c5aca43d5;hb=33fc7bb08d50591a28b5a12725baa1b50abe253f;hp=92c5ef4280ab31031c24c2eccd0e08e70ea75b02;hpb=5a229d270d01b73907b6d303f7215e995a8e67e4;p=nodemanager.git diff --git a/database.py b/database.py index 92c5ef4..7e75d55 100644 --- a/database.py +++ b/database.py @@ -103,10 +103,18 @@ class Database(dict): 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) - - # Wake up bwmom to update limits. + 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() global dump_requested dump_requested = True