From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Tue, 18 Nov 2008 21:58:25 +0000 (+0000)
Subject: Ensure delegated slivers have their info synced with PLC after ticket is delivered.
X-Git-Tag: NodeManager-1.8-1~17
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=cd2099633da09df2636a1cc38f695f00870c7e6a

Ensure delegated slivers have their info synced with PLC after ticket is delivered.
---

diff --git a/database.py b/database.py
index c8623b3..7e75d55 100644
--- a/database.py
+++ b/database.py
@@ -103,16 +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)
-            elif rec['instantiation'] == 'nm-controller': accounts.get(name).ensure_created(rec)
+            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':
-                slivr = accounts.get(name)
+            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.
+        # Wake up bwmom to update limits.
         bwmon.lock.set()
         global dump_requested
         dump_requested = True