X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=account.py;h=b15bb6701e8019519b169b0819be5096ec0ea2ac;hb=61de759490f9e654805cd0f4f59f97d926e202ec;hp=ac0231228a21289db0835be49ebc6c01ae9939d8;hpb=cdf732863cd300caf8222c59e3f38256d9e04fca;p=nodemanager.git diff --git a/account.py b/account.py index ac02312..b15bb67 100644 --- a/account.py +++ b/account.py @@ -27,6 +27,7 @@ maximum stack size. import os import pwd, grp import threading +import subprocess import logger import tools @@ -69,12 +70,13 @@ def get(name): finally: name_worker_lock.release() +# xxx strictly speaking this class should not use self.name that in fact +# is accidentally inited by the subclasses constructor... class Account: - def __init__(self, rec): - logger.verbose('account: Initing account %s'%rec['name']) - self.name = rec['name'] + def __init__(self, name): + self.name = name self.keys = '' - self.configure(rec) + logger.verbose('account: Initing account %s'%name) @staticmethod def create(name, vref = None): abstract @@ -121,6 +123,26 @@ class Account: def stop(self): pass def is_running(self): pass + # bind mount root side dir to sliver side + # needs to be done before sliver starts, in the vserver case at least + def expose_ssh_dir (self): + try: + root_ssh="/home/%s/.ssh"%self.name + sliver_ssh="/vservers/%s/home/%s/.ssh"%(self.name,self.name) + # any of both might not exist yet + for path in [root_ssh,sliver_ssh]: + if not os.path.exists (path): + os.mkdir(path) + if not os.path.isdir (path): + raise Exception + mounts=file('/proc/mounts').read() + if mounts.find(sliver_ssh)<0: + # xxx perform mount + subprocess.call("mount --bind -o ro %s %s"%(root_ssh,sliver_ssh),shell=True) + logger.log("expose_ssh_dir: %s mounted into slice %s"%(root_ssh,self.name)) + except: + logger.log_exc("expose_ssh_dir with slice %s failed"%self.name) + class Worker: def __init__(self, name): @@ -140,7 +162,7 @@ If still valid, check if running and configure/start if not.""" try: next_class.create(self.name, rec) finally: create_sem.release() if not isinstance(self._acct, next_class): self._acct = next_class(rec) - logger.verbose("account.ensure_created: %s, running=%r"%(self.name,self.is_running())) + logger.verbose("account.Worker.ensure_created: %s, running=%r"%(self.name,self.is_running())) # reservation_alive is set on reervable nodes, and its value is a boolean if 'reservation_alive' in rec: @@ -191,23 +213,3 @@ If still valid, check if running and configure/start if not.""" except KeyError: return None return shell_acct_class[shell] - # bind mount root side dir to sliver side - # needs to be done before sliver starts, in the vserver case at least - def expose_ssh_dir (self): - try: - root_ssh="/home/%s/.ssh"%self.name - sliver_ssh="/vservers/%s/home/%s/.ssh"%(self.name,self.name) - # any of both might not exist yet - for path in [root_ssh,sliver_ssh]: - if not os.path.exists (path): - os.mkdir(path) - if not os.path.isdir (path): - raise Exception - mounts=file('/proc/mounts').read() - if mounts.find(sliver_ssh)<0: - # xxx perform mount - subprocess.call("mount --bind -o ro %s %s"%(root_ssh,sliver_ssh),shell=True) - logger.log("expose_ssh_dir: %s mounted into slice %s"%(root_ssh,self.name)) - except: - logger.log_exc("expose_ssh_dir with slice %s failed"%self.name) -