Merge branch 'lxc_devel' of ssh://git.planet-lab.org/git/nodemanager into lxc_devel

[nodemanager.git] / accounts.py

diff --git a/accounts.py b/accounts.py
index e9191d5..2f3bb32 100644 (file)
--- a/accounts.py
+++ b/accounts.py
@@ -1,5 +1,4 @@
-# $Id$
-# $URL$
+### 
 
 """Functionality common to all account classes.
 
@@ -33,8 +32,6 @@ import logger
 import tools
 
 
-# When this variable is true, start after any ensure_created
-Startingup = False
 # shell path -> account class association
 shell_acct_class = {}
 # account type -> account class association
@@ -77,7 +74,6 @@ class Account:
         logger.verbose('accounts: Initing account %s'%rec['name'])
         self.name = rec['name']
         self.keys = ''
-        self.initscriptchanged = False
         self.configure(rec)
 
     @staticmethod
@@ -131,7 +127,7 @@ class Worker:
         self.name = name  # username
         self._acct = None  # the account object currently associated with this worker
 
-    def ensure_created(self, rec, startingup = Startingup):
+    def ensure_created(self, rec):
         """Check account type is still valid.  If not, recreate sliver.
 If still valid, check if running and configure/start if not."""
         logger.log_data_in_file(rec,"/var/lib/nodemanager/%s.rec.txt"%rec['name'],
@@ -141,15 +137,28 @@ If still valid, check if running and configure/start if not."""
         if next_class != curr_class:
             self._destroy(curr_class)
             create_sem.acquire()
-            try: next_class.create(self.name, rec['vref'])
+            try: next_class.create(self.name, rec)
             finally: create_sem.release()
         if not isinstance(self._acct, next_class): self._acct = next_class(rec)
-        if startingup or \
-          not self.is_running() or \
-          next_class != curr_class or \
-          self._acct.initscriptchanged:
-            self.start(rec)
-        else: self._acct.configure(rec)
+        logger.verbose("accounts.ensure_created: %s, running=%r"%(self.name,self.is_running()))
+
+        # reservation_alive is set on reervable nodes, and its value is a boolean
+        if 'reservation_alive' in rec:
+            # reservable nodes
+            if rec['reservation_alive']:
+                # this sliver has the lease, it is safe to start it
+                if not self.is_running(): self.start(rec)
+                else: self.configure(rec)
+            else:
+                # not having the lease, do not start it
+                self.configure(rec)
+        # usual nodes - preserve old code
+        # xxx it's not clear what to do when a sliver changes type/class
+        # in a reservable node
+        else:
+            if not self.is_running() or next_class != curr_class:
+                self.start(rec)
+            else: self.configure(rec)
 
     def ensure_destroyed(self): self._destroy(self._get_class())
 
@@ -157,6 +166,9 @@ If still valid, check if running and configure/start if not."""
         self._acct.configure(rec)
         self._acct.start(delay=d)
 
+    def configure(self, rec):
+        self._acct.configure(rec)
+
     def stop(self): self._acct.stop()
 
     def is_running(self):