X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=slivermanager.py;h=383379e959759c182ba3690b953084f099bddcd8;hb=refs%2Fheads%2Fdevel;hp=2122865119b6590e3215dd625fd849ae53c4148a;hpb=b2fb90af28df5c4dda68871b217530aff57690d5;p=nodemanager.git diff --git a/slivermanager.py b/slivermanager.py index 2122865..383379e 100644 --- a/slivermanager.py +++ b/slivermanager.py @@ -1,6 +1,4 @@ -# $Id$ -# $URL$ - +# """Sliver manager. The sliver manager has several functions. It is responsible for @@ -11,6 +9,7 @@ responsible for handling delegation accounts. """ import string,re +import time import logger import api, api_calls @@ -30,6 +29,7 @@ DEFAULT_ALLOCATION = { # CPU parameters 'cpu_pct': 0, # percent CPU reserved 'cpu_share': 1, # proportional share + 'cpu_cores': "0b", # reserved cpu cores [b] # bandwidth parameters 'net_min_rate': bwmin / 1000, # kbps 'net_max_rate': bwmax / 1000, # kbps @@ -57,6 +57,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 @@ -82,15 +128,16 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True): if network['is_primary'] and network['bwlimit'] is not None: DEFAULT_ALLOCATION['net_max_rate'] = network['bwlimit'] / 1000 - # Take initscripts (global) returned by API, make dict + # Take initscripts (global) returned by API, build a hash scriptname->code + iscripts_hash = {} if 'initscripts' not in data: logger.log_missing_data("slivermanager.GetSlivers",'initscripts') return - initscripts = {} - for is_rec in data['initscripts']: - logger.verbose("slivermanager: initscript: %s" % is_rec['name']) - initscripts[str(is_rec['name'])] = is_rec['script'] + for initscript_rec in data['initscripts']: + logger.verbose("slivermanager: initscript: %s" % initscript_rec['name']) + iscripts_hash[str(initscript_rec['name'])] = initscript_rec['script'] + adjustReservedSlivers (data) for sliver in data['slivers']: logger.verbose("slivermanager: %s: slivermanager.GetSlivers in slivers loop"%sliver['name']) rec = sliver.copy() @@ -116,12 +163,17 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True): # set the vserver reference. If none, set to default. rec.setdefault('vref', attributes.get('vref', 'default')) - # set initscripts. first check if exists, if not, leave empty. - is_name = attributes.get('initscript') - if is_name is not None and is_name in initscripts: - rec['initscript'] = initscripts[is_name] + ### set initscripts; set empty rec['initscript'] if not + # if tag 'initscript_code' is set, that's what we use + iscode = attributes.get('initscript_code','') + if iscode: + rec['initscript']=iscode else: - rec['initscript'] = '' + isname = attributes.get('initscript') + if isname is not None and isname in iscripts_hash: + rec['initscript'] = iscripts_hash[isname] + else: + rec['initscript'] = '' # set delegations, if none, set empty rec.setdefault('delegations', attributes.get("delegations", [])) @@ -132,31 +184,32 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True): for resname, default_amount in DEFAULT_ALLOCATION.iteritems(): try: t = type(default_amount) - amt = t.__new__(t, attributes[resname]) - except (KeyError, ValueError): amt = default_amount - rspec[resname] = amt + amount = t.__new__(t, attributes[resname]) + except (KeyError, ValueError): amount = default_amount + rspec[resname] = amount # add in sysctl attributes into the rspec for key in attributes.keys(): if key.find("sysctl.") == 0: rspec[key] = attributes[key] + # also export tags in rspec so they make it to the sliver_vs.start call + rspec['tags']=attributes + database.db.deliver_record(rec) if fullupdate: database.db.set_min_timestamp(data['timestamp']) # slivers are created here. database.db.sync() - accounts.Startingup = False -def deliver_ticket(data): +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()