X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=slivermanager.py;h=4a3c3ebb9503ea08e1bb001f6c19700c31ffb26d;hb=570d234b7d7b40416b296de71225f28c826ee991;hp=383379e959759c182ba3690b953084f099bddcd8;hpb=a59241a590ca035a320f06fa7cca0d309af53f5a;p=nodemanager.git diff --git a/slivermanager.py b/slivermanager.py index 383379e..4a3c3eb 100644 --- a/slivermanager.py +++ b/slivermanager.py @@ -1,4 +1,3 @@ -# """Sliver manager. The sliver manager has several functions. It is responsible for @@ -8,20 +7,40 @@ also to make inter-sliver resource loans. The sliver manager is also responsible for handling delegation accounts. """ -import string,re +import string +import re import time import logger import api, api_calls import database -import accounts +import account import controller -import sliver_vs -try: from bwlimit import bwmin, bwmax -except ImportError: bwmin, bwmax = 8, 1000*1000*1000 +try: + import sliver_lxc + implementation='lxc' + sliver_default_type='sliver.LXC' + sliver_class_to_register = sliver_lxc.Sliver_LXC + sliver_password_shell = sliver_lxc.Sliver_LXC.SHELL +except: + try: + import sliver_vs + implementation='vs' + sliver_default_type='sliver.VServer' + sliver_class_to_register = sliver_vs.Sliver_VS + sliver_password_shell = sliver_vs.Sliver_VS.SHELL + except: + logger.log("Could not import either sliver_lxc or sliver_vs - bailing out") + exit(1) + +# just being safe +try: + from plnode.bwlimit import bwmin, bwmax +except: + bwmin, bwmax = 8, 1000*1000*1000 -priority=10 +priority = 10 DEFAULT_ALLOCATION = { @@ -30,6 +49,7 @@ DEFAULT_ALLOCATION = { 'cpu_pct': 0, # percent CPU reserved 'cpu_share': 1, # proportional share 'cpu_cores': "0b", # reserved cpu cores [b] + 'cpu_freezable': 0, # freeze processes if cpu_cores is 0 # bandwidth parameters 'net_min_rate': bwmin / 1000, # kbps 'net_max_rate': bwmax / 1000, # kbps @@ -68,7 +88,8 @@ def adjustReservedSlivers (data): 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()) + if policy is not None: + logger.log ("unexpected reservation_policy %(policy)s"%locals()) return logger.log("slivermanager.adjustReservedSlivers") @@ -92,7 +113,7 @@ def adjustReservedSlivers (data): 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 @@ -117,9 +138,12 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True): node_id = None try: f = open('/etc/planetlab/node_id') - try: node_id = int(f.read()) - finally: f.close() - except: logger.log_exc("slivermanager: GetSlivers failed to read /etc/planetlab/node_id") + try: + node_id = int(f.read()) + finally: + f.close() + except: + logger.log_exc("slivermanager: GetSlivers failed to read /etc/planetlab/node_id") if data.has_key('node_id') and data['node_id'] != node_id: return @@ -131,7 +155,7 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True): # 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') + logger.log_missing_data("slivermanager.GetSlivers", 'initscripts') return for initscript_rec in data['initscripts']: logger.verbose("slivermanager: initscript: %s" % initscript_rec['name']) @@ -158,16 +182,16 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True): if rec['instantiation'].lower() == 'nm-controller': rec.setdefault('type', attributes.get('type', 'controller.Controller')) else: - rec.setdefault('type', attributes.get('type', 'sliver.VServer')) + rec.setdefault('type', attributes.get('type', sliver_default_type)) # set the vserver reference. If none, set to default. rec.setdefault('vref', attributes.get('vref', 'default')) ### set initscripts; set empty rec['initscript'] if not # if tag 'initscript_code' is set, that's what we use - iscode = attributes.get('initscript_code','') + iscode = attributes.get('initscript_code', '') if iscode: - rec['initscript']=iscode + rec['initscript'] = iscode else: isname = attributes.get('initscript') if isname is not None and isname in iscripts_hash: @@ -194,10 +218,11 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True): rspec[key] = attributes[key] # also export tags in rspec so they make it to the sliver_vs.start call - rspec['tags']=attributes + rspec['tags'] = attributes database.db.deliver_record(rec) - if fullupdate: database.db.set_min_timestamp(data['timestamp']) + if fullupdate: + database.db.set_min_timestamp(data['timestamp']) # slivers are created here. database.db.sync() @@ -205,11 +230,31 @@ def deliver_ticket(data): return GetSlivers(data, fullupdate=False) 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) + # No default allocation values for LXC yet, think if its necessary given + # that they are also default allocation values in this module + if implementation == 'vs': + for resname, default_amount in sliver_vs.DEFAULT_ALLOCATION.iteritems(): + DEFAULT_ALLOCATION[resname]=default_amount + + account.register_class(sliver_class_to_register) + account.register_class(controller.Controller) database.start() api_calls.deliver_ticket = deliver_ticket api.start() + +### check if a sliver is running +### a first step to a unified code for codemux +def is_running (name): + if implementation=='vs': + import vserver + return vserver.VServer(name).is_running() + else: + import libvirt + running = False + try: + conn = libvirt.open('lxc://') + dom = conn.lookupByName(name) + running = dom.info()[0] == libvirt.VIR_DOMAIN_RUNNING + finally: + conn.close() + return running