X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=accounts.py;h=cb41b67147b7c086bbfcc83b01a6d57a01e966a7;hb=1c9b3e2b064f8c60ace707f42f9e164f1d44b10c;hp=5066b9e65dcdad1f814dfe9438bc4179a3f0d716;hpb=af198e0763c05705ba87a1753209b17df38e3f69;p=nodemanager.git diff --git a/accounts.py b/accounts.py index 5066b9e..cb41b67 100644 --- a/accounts.py +++ b/accounts.py @@ -1,12 +1,14 @@ """Functionality common to all account classes. -Each subclass of Account must provide five methods: create(), -destroy(), configure(), start(), and stop(). In addition, it 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, which contains a description of the type that -it uses. TYPE is divided hierarchically by periods; at the moment the -only convention is that all sliver accounts have type that begins with -sliver. +that it uses; and TYPE, a string that is used by the account creation +code. For no particular reason, TYPE is divided hierarchically by +periods; at the moment the only convention is that all sliver accounts +have type that begins with sliver. There are any number of race conditions that may result from the fact that account names are not unique over time. Moreover, it's a bad @@ -27,6 +29,12 @@ import logger 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 @@ -42,9 +50,12 @@ def register_class(acct_class): name_worker_lock = threading.Lock() name_worker = {} +def allpwents(): + return [pw_ent for pw_ent in pwd.getpwall() if pw_ent[6] in shell_acct_class] + def all(): """Return the names of all accounts on the system with recognized shells.""" - return [pw_ent[0] for pw_ent in pwd.getpwall() if pw_ent[6] in shell_acct_class] + return [pw_ent[0] for pw_ent in allpwents()] def get(name): """Return the worker object for a particular username. If no such object exists, create it first.""" @@ -57,30 +68,34 @@ def get(name): class Account: def __init__(self, rec): + logger.verbose('Initing account %s'%rec['name']) self.name = rec['name'] self.keys = '' + self.initscriptchanged = False self.configure(rec) @staticmethod - def create(name): abstract + 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) new_keys = rec['keys'] if new_keys != self.keys: self.keys = new_keys dot_ssh = '/home/%s/.ssh' % self.name def do_installation(): if not os.access(dot_ssh, os.F_OK): os.mkdir(dot_ssh) - tools.write_file(dot_ssh + '/authorized_keys', lambda f: f.write(keys)) - logger.log('%s: installing ssh keys' % self.name) + os.chmod(dot_ssh, 0700) + tools.write_file(dot_ssh + '/authorized_keys', lambda f: f.write(new_keys)) + logger.verbose('%s: installing ssh keys' % self.name) tools.fork_as(self.name, do_installation) - def start(self): pass + 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 @@ -98,29 +113,45 @@ class Worker: def ensure_created(self, rec): """Cause the account specified by to exist if it doesn't already.""" - self._q.put((self._ensure_created, rec.copy())) + if rec.has_key('name'): + logger.verbose('Worker.ensure_created with name=%s'%rec['name']) + self._q.put((self._ensure_created, rec.copy(), Startingup)) + logger.verbose('Worker queue has %d item(s)'%self._q.qsize()) - def _ensure_created(self, rec): + def _ensure_created(self, rec, startingup): 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() - try: next_class.create(self.name) + try: next_class.create(self.name, rec['vref']) finally: self._create_sem.release() - if not isinstance(self._acct, next_class): self._acct = next_class(self.name, rec) + if not isinstance(self._acct, next_class): self._acct = next_class(rec) else: self._acct.configure(rec) - if next_class != curr_class: self._acct.start() + 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._q.put((self._ensure_destroyed,)) def _ensure_destroyed(self): self._destroy(self._get_class()) - def start(self): self._q.put((self._start,)) - def _start(self): self._acct.start() + def start(self, delay=0): self._q.put((self._start, delay)) + def _start(self, d): self._acct.start(delay=d) def stop(self): self._q.put((self._stop,)) def _stop(self): self._acct.stop() + def is_running(self): + status = self._acct.is_running() + if not status: logger.verbose("Worker(%s): is not running" % self.name) + return status + def _destroy(self, curr_class): self._acct = None if curr_class: @@ -134,8 +165,11 @@ class Worker: 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() + except: + logger.log_exc(self.name)