X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=accounts.py;h=e9191d5f31dc8f90d70261cbef266fa63bbc02b5;hb=d3a3b2d3ea98e72183d1cb5497c38badaa0c5863;hp=1fd264f7c6f52103893c46b69ca9f809434fb42b;hpb=c2ce4bf43f46ab89a72f8811caa10989e57ce967;p=nodemanager.git diff --git a/accounts.py b/accounts.py index 1fd264f..e9191d5 100644 --- a/accounts.py +++ b/accounts.py @@ -1,9 +1,14 @@ +# $Id$ +# $URL$ + """Functionality common to all account classes. -Each subclass of Account must provide five methods: create() and -destroy(), which are static; configure(), start(), and stop(), which -are not. configure(), which takes a record as its only argument, does -things like set up ssh keys. In addition, an Account subclass must +Each subclass of Account must provide five methods: + (*) create() and destroy(), which are static; + (*) configure(), start(), and stop(), which are not. + +configure(), which takes a record as its only argument, does +things like set up ssh keys. In addition, an Account subclass must provide static member variables SHELL, which contains the unique shell that it uses; and TYPE, a string that is used by the account creation code. For no particular reason, TYPE is divided hierarchically by @@ -20,10 +25,8 @@ numbers of accounts, this may cause the NM process to run out of maximum stack size. """ -import Queue import os -import pwd -from grp import getgrnam +import pwd, grp import threading import logger @@ -32,17 +35,19 @@ import tools # When this variable is true, start after any ensure_created Startingup = False -# Cumulative delay for starts when Startingup is true -csd_lock = threading.Lock() -cumstartdelay = 0 - # shell path -> account class association shell_acct_class = {} # account type -> account class association type_acct_class = {} +# these semaphores are acquired before creating/destroying an account +create_sem = threading.Semaphore(1) +destroy_sem = threading.Semaphore(1) + def register_class(acct_class): - """Call once for each account class. This method adds the class to the dictionaries used to look up account classes by shell and type.""" + """Call once for each account class. This method adds the class +to the dictionaries used to look up account classes by shell and +type.""" shell_acct_class[acct_class.SHELL] = acct_class type_acct_class[acct_class.TYPE] = acct_class @@ -69,7 +74,7 @@ def get(name): class Account: def __init__(self, rec): - logger.verbose('Initing account %s'%rec['name']) + logger.verbose('accounts: Initing account %s'%rec['name']) self.name = rec['name'] self.keys = '' self.initscriptchanged = False @@ -77,109 +82,99 @@ class Account: @staticmethod def create(name, vref = None): abstract + @staticmethod def destroy(name): abstract def configure(self, rec): """Write to my authorized_keys file.""" - logger.verbose('in accounts:configure for %s'%self.name) + logger.verbose('accounts: configuring %s'%self.name) new_keys = rec['keys'] if new_keys != self.keys: - self.keys = new_keys - dot_ssh = '/home/%s/.ssh' % self.name - if not os.access(dot_ssh, os.F_OK): os.mkdir(dot_ssh) + # get the unix account info + gid = grp.getgrnam("slices")[2] + pw_info = pwd.getpwnam(self.name) + uid = pw_info[2] + pw_dir = pw_info[5] + + # write out authorized_keys file and conditionally create + # the .ssh subdir if need be. + dot_ssh = os.path.join(pw_dir,'.ssh') + if not os.path.isdir(dot_ssh): + if not os.path.isdir(pw_dir): + logger.verbose('accounts: WARNING: homedir %s does not exist for %s!'%(pw_dir,self.name)) + os.mkdir(pw_dir) + os.chown(pw_dir, uid, gid) + os.mkdir(dot_ssh) + + auth_keys = os.path.join(dot_ssh,'authorized_keys') + tools.write_file(auth_keys, lambda f: f.write(new_keys)) + + # set access permissions and ownership properly os.chmod(dot_ssh, 0700) - tools.write_file(dot_ssh + '/authorized_keys', lambda f: f.write(new_keys)) - logger.log('%s: installing ssh keys' % self.name) - user = pwd.getpwnam(self.name)[2] - group = getgrnam("slices")[2] - os.chown(dot_ssh, user, group) - os.chown(dot_ssh + '/authorized_keys', user, group) + os.chown(dot_ssh, uid, gid) + os.chmod(auth_keys, 0600) + os.chown(auth_keys, uid, gid) + + # set self.keys to new_keys only when all of the above ops succeed + self.keys = new_keys + + logger.log('accounts: %s: installed ssh keys' % self.name) def start(self, delay=0): pass def stop(self): pass def is_running(self): pass class Worker: - # these semaphores are acquired before creating/destroying an account - _create_sem = threading.Semaphore(1) - _destroy_sem = threading.Semaphore(1) def __init__(self, name): self.name = name # username self._acct = None # the account object currently associated with this worker - # task list - # outsiders request operations by putting (fn, args...) tuples on _q - # the worker thread (created below) will perform these operations in order - self._q = Queue.Queue(maxsize=4) # keep from overflowing and backing up. - tools.as_daemon_thread(self._run) - - def ensure_created(self, rec): - """Cause the account specified by to exist if it doesn't already.""" - if rec.has_key('name'): - logger.verbose('Worker.ensure_created with name=%s'%rec['name']) - self._enqueue((self._ensure_created, rec.copy(), Startingup)) - logger.verbose('Worker queue has %d item(s)'%self._q.qsize()) - - def _ensure_created(self, rec, startingup): + + def ensure_created(self, rec, startingup = Startingup): + """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'], + 'raw rec captured in ensure_created',logger.LOG_VERBOSE) curr_class = self._get_class() next_class = type_acct_class[rec['type']] if next_class != curr_class: self._destroy(curr_class) - self._create_sem.acquire() + create_sem.acquire() try: next_class.create(self.name, rec['vref']) - finally: self._create_sem.release() + 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) - if startingup or not self.is_running(): - csd_lock.acquire() - global cumstartdelay - delay = cumstartdelay - cumstartdelay += 2 - csd_lock.release() - self._acct.start(delay=delay) - elif next_class != curr_class or self._acct.initscriptchanged: - self._acct.start() - - def ensure_destroyed(self): self._enqueue((self._ensure_destroyed,)) - def _ensure_destroyed(self): self._destroy(self._get_class()) - - def start(self, delay=0): self._enqueue((self._start, delay)) - def _start(self, d): self._acct.start(delay=d) - - def stop(self): self._enqueue((self._stop,)) - def _stop(self): self._acct.stop() - - def is_running(self): - if self._acct.is_running(): + + def ensure_destroyed(self): self._destroy(self._get_class()) + + def start(self, rec, d = 0): + self._acct.configure(rec) + self._acct.start(delay=d) + + def stop(self): self._acct.stop() + + def is_running(self): + if (self._acct != None) and self._acct.is_running(): status = True else: status = False - logger.verbose("Worker(%s): is not running" % self.name) + logger.verbose("accounts: Worker(%s): is not running" % self.name) return status def _destroy(self, curr_class): self._acct = None if curr_class: - self._destroy_sem.acquire() + destroy_sem.acquire() try: curr_class.destroy(self.name) - finally: self._destroy_sem.release() + finally: destroy_sem.release() def _get_class(self): try: shell = pwd.getpwnam(self.name)[6] except KeyError: return None return shell_acct_class[shell] - - def _run(self): - """Repeatedly pull commands off the queue and execute. If memory usage becomes an issue, it might be wise to terminate after a while.""" - while True: - try: - logger.verbose('Worker:_run : getting - size is %d'%self._q.qsize()) - cmd = self._q.get() - cmd[0](*cmd[1:]) - except: - logger.log_exc(self.name) - - def _enqueue(self, cmds): - try: self._q.put_nowait(cmds) - except Queue.Full: logger.log("%s Worker queue full." % self.name)