X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=slivermanager.py;h=8f1ae3efc79beaa86ae18628383f6435f9f7f5e1;hb=ace06487b47fbc1aee631ba3494456c565cc8bc4;hp=d2d613180537f084a6f71715480a8739a207f657;hpb=d3a3b2d3ea98e72183d1cb5497c38badaa0c5863;p=nodemanager.git

diff --git a/slivermanager.py b/slivermanager.py
index d2d6131..8f1ae3e 100644
--- a/slivermanager.py
+++ b/slivermanager.py
@@ -11,6 +11,7 @@ responsible for handling delegation accounts.
 """
 
 import string,re
+import time
 
 import logger
 import api, api_calls
@@ -57,6 +58,52 @@ DEFAULT_ALLOCATION = {
 
 start_requested = False  # set to True in order to request that all slivers be started
 
+# check leases and adjust the 'reservation_alive' field in slivers
+# this is not expected to be saved as it will change for the next round
+def adjustReservedSlivers (data):
+    """
+    On reservable nodes, tweak the 'reservation_alive' field to instruct cyclic loop
+    about what to do with slivers.
+    """
+    # only impacts reservable nodes
+    if 'reservation_policy' not in data: return
+    policy=data['reservation_policy'] 
+    if policy not in ['lease_or_idle', 'lease_or_shared']:
+        logger.log ("unexpected reservation_policy %(policy)s"%locals())
+        return
+
+    logger.log("slivermanager.adjustReservedSlivers")
+    now=int(time.time())
+    # scan leases that are expected to show in ascending order
+    active_lease=None
+    for lease in data['leases']:
+        if lease['t_from'] <= now and now <= lease['t_until']:
+            active_lease=lease
+            break
+
+    def is_system_sliver (sliver):
+        for d in sliver['attributes']:
+            if d['tagname']=='system' and d['value']:
+                return True
+        return False
+
+    # mark slivers as appropriate
+    for sliver in data['slivers']:
+        # system slivers must be kept alive
+        if is_system_sliver(sliver):
+            sliver['reservation_alive']=True
+            continue
+        
+        # regular slivers
+        if not active_lease:
+            # with 'idle_or_shared', just let the field out, behave like a shared node
+            # otherwise, mark all slivers as being turned down
+            if policy == 'lease_or_idle':
+                sliver['reservation_alive']=False
+        else:
+            # there is an active lease, mark it alive and the other not
+            sliver['reservation_alive'] = sliver['name']==active_lease['name']
+
 @database.synchronized
 def GetSlivers(data, config = None, plc=None, fullupdate=True):
     """This function has two purposes.  One, convert GetSlivers() data
@@ -91,6 +138,7 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True):
         logger.verbose("slivermanager: initscript: %s" % is_rec['name'])
         initscripts[str(is_rec['name'])] = is_rec['script']
 
+    adjustReservedSlivers (data)
     for sliver in data['slivers']:
         logger.verbose("slivermanager: %s: slivermanager.GetSlivers in slivers loop"%sliver['name'])
         rec = sliver.copy()
@@ -145,18 +193,16 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True):
     if fullupdate: database.db.set_min_timestamp(data['timestamp'])
     # slivers are created here.
     database.db.sync()
-    accounts.Startingup = False
 
 def deliver_ticket(data):
     return GetSlivers(data, fullupdate=False)
 
-def start(options, config):
+def start():
     for resname, default_amount in sliver_vs.DEFAULT_ALLOCATION.iteritems():
         DEFAULT_ALLOCATION[resname]=default_amount
 
     accounts.register_class(sliver_vs.Sliver_VS)
     accounts.register_class(controller.Controller)
-    accounts.Startingup = options.startup
     database.start()
     api_calls.deliver_ticket = deliver_ticket
     api.start()