X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tools.py;h=1cef74699ecbe58cac5b2d7cbc69e4d321ae82ba;hb=e57432c1dfdfeaa52cc32799e2abbc34b7704ce9;hp=b90a59e5c902d2700e82e4fe62de58321746a63c;hpb=1b7d8ef3d9ddf592a8f97ef89b91ed457f1ba6b7;p=nodemanager.git diff --git a/tools.py b/tools.py index b90a59e..1cef746 100644 --- a/tools.py +++ b/tools.py @@ -1,3 +1,5 @@ +# -*- python-indent: 4 -*- + """A few things that didn't seem to fit anywhere else.""" import os, os.path @@ -11,24 +13,6 @@ import shutil import sys import signal -################################################### -# Added by Guilherme Sperb Machado -################################################### - -import re -import socket -import fileinput - -# TODO: is there anything better to do if the "libvirt", "sliver_libvirt", -# and "sliver_lxc" are not in place? -try: - import libvirt - from sliver_libvirt import Sliver_Libvirt - import sliver_lxc -except: - logger.log("Could not import sliver_lxc or libvirt or sliver_libvirt -- which is required here.") -################################################### - import logger PID_FILE = '/var/run/nodemanager.pid' @@ -87,7 +71,14 @@ def daemon(): os.dup2(crashlog, 2) def fork_as(su, function, *args): - """fork(), cd / to avoid keeping unused directories open, close all nonstandard file descriptors (to avoid capturing open sockets), fork() again (to avoid zombies) and call with arguments in the grandchild process. If is not None, set our group and user ids appropriately in the child process.""" + """ +fork(), cd / to avoid keeping unused directories open, +close all nonstandard file descriptors (to avoid capturing open sockets), +fork() again (to avoid zombies) and call +with arguments in the grandchild process. +If is not None, set our group and user ids + appropriately in the child process. + """ child_pid = os.fork() if child_pid == 0: try: @@ -109,9 +100,11 @@ def fork_as(su, function, *args): #################### # manage files def pid_file(): - """We use a pid file to ensure that only one copy of NM is running at a given time. + """ +We use a pid file to ensure that only one copy of NM is running at a given time. If successful, this function will write a pid file containing the pid of the current process. -The return value is the pid of the other running process, or None otherwise.""" +The return value is the pid of the other running process, or None otherwise. + """ other_pid = None if os.access(PID_FILE, os.F_OK): # check for a pid file handle = open(PID_FILE) # pid file exists, read it @@ -128,7 +121,10 @@ The return value is the pid of the other running process, or None otherwise.""" return other_pid def write_file(filename, do_write, **kw_args): - """Write file atomically by opening a temporary file, using to write that file, and then renaming the temporary file.""" + """ +Write file atomically by opening a temporary file, +using to write that file, and then renaming the temporary file. + """ shutil.move(write_temp_file(do_write, **kw_args), filename) def write_temp_file(do_write, mode=None, uidgid=None): @@ -140,13 +136,16 @@ def write_temp_file(do_write, mode=None, uidgid=None): finally: f.close() return temporary_filename -# replace a target file with a new contents - checks for changes -# can handle chmod if requested -# can also remove resulting file if contents are void, if requested -# performs atomically: -# writes in a tmp file, which is then renamed (from sliverauth originally) -# returns True if a change occurred, or the file is deleted def replace_file_with_string (target, new_contents, chmod=None, remove_if_empty=False): + """ +Replace a target file with a new contents +checks for changes: does not do anything if previous state was already right +can handle chmod if requested +can also remove resulting file if contents are void, if requested +performs atomically: +writes in a tmp file, which is then renamed (from sliverauth originally) +returns True if a change occurred, or the file is deleted + """ try: current=file(target).read() except: @@ -170,7 +169,6 @@ def replace_file_with_string (target, new_contents, chmod=None, remove_if_empty= if chmod: os.chmod(target,chmod) return True - #################### # utilities functions to get (cached) information from the node @@ -217,10 +215,11 @@ class NMLock: # running ifconfig inside of the slice's context. def get_sliver_process(slice_name, process_cmdline): - """ Utility function to find a process inside of an LXC sliver. Returns - (cgroup_fn, pid). cgroup_fn is the filename of the cgroup file for - the process, for example /proc/2592/cgroup. Pid is the process id of - the process. If the process is not found then (None, None) is returned. + """ + Utility function to find a process inside of an LXC sliver. Returns + (cgroup_fn, pid). cgroup_fn is the filename of the cgroup file for + the process, for example /proc/2592/cgroup. Pid is the process id of + the process. If the process is not found then (None, None) is returned. """ try: cmd = 'grep %s /proc/*/cgroup | grep freezer'%slice_name @@ -238,6 +237,11 @@ def get_sliver_process(slice_name, process_cmdline): path = l.split(':')[0] comp = l.rsplit(':')[-1] slice_name_check = comp.rsplit('/')[-1] + # the lines below were added by Guilherme + # due to the ipv6 plugin requirements (LXC) + virt=get_node_virt() + if virt=='lxc': + slice_name_check = slice_name_check.rsplit('.')[0] if (slice_name_check == slice_name): slice_path = path @@ -256,68 +260,31 @@ def get_sliver_process(slice_name, process_cmdline): return (cgroup_fn, pid) ################################################### -# Author: Guilherme Sperb Machado -################################################### -# Basically this method is just a copy from "get_process()", just -# adding one more split() to correctly parse the processes for LXC. -# Only for LXC! -# TODO: maybe merge both methods, and put the type as an argument, if -# it is LXC or vserver +# Added by Guilherme Sperb Machado ################################################### -def get_sliver_process_lxc(slice_name, process_cmdline): - """ Utility function to find a process inside of an LXC sliver. Returns - (cgroup_fn, pid). cgroup_fn is the filename of the cgroup file for - the process, for example /proc/2592/cgroup. Pid is the process id of - the process. If the process is not found then (None, None) is returned. - """ - try: - cmd = 'grep %s /proc/*/cgroup | grep freezer'%slice_name - output = os.popen(cmd).readlines() - except: - # the slice couldn't be found - logger.log("get_sliver_process: couldn't find slice %s" % slice_name) - return (None, None) - cgroup_fn = None - pid = None - for e in output: - try: - l = e.rstrip() - #logger.log("tools: l=%s" % (l) ) - path = l.split(':')[0] - #logger.log("tools: path=%s" % (path) ) - comp = l.rsplit(':')[-1] - #logger.log("tools: comp=%s" % (comp) ) - slice_name_check1 = comp.rsplit('/')[-1] - #logger.log("tools: slice_name_check1=%s" % (slice_name_check1) ) - slice_name_check2 = slice_name_check1.rsplit('.')[0] - #logger.log("tools: slice_name_check2=%s" % (slice_name_check2) ) - - if (slice_name_check2 == slice_name): - slice_path = path - pid = slice_path.split('/')[2] - #logger.log("tools: pid=%s" % (pid) ) - cmdline = open('/proc/%s/cmdline'%pid).read().rstrip('\n\x00') - #logger.log("tools: cmdline=%s" % (cmdline) ) - #logger.log("tools: process_cmdline=%s" % (process_cmdline) ) - if (cmdline == process_cmdline): - cgroup_fn = slice_path - break - except: - #logger.log("tools: break!") - break - - if (not cgroup_fn) or (not pid): - logger.log("get_sliver_process: process %s not running in slice %s" % (process_cmdline, slice_name)) - return (None, None) - - return (cgroup_fn, pid) +try: + import re + import socket + import fileinput +except: + logger.log("Could not import 're', 'socket', or 'fileinput' python packages.") +# TODO: is there anything better to do if the "libvirt", "sliver_libvirt", +# and "sliver_lxc" are not in place? +try: + import libvirt + from sliver_libvirt import Sliver_Libvirt + import sliver_lxc +except: + logger.log("Could not import 'sliver_lxc' or 'libvirt' or 'sliver_libvirt'.") +################################################### def get_sliver_ifconfig(slice_name, device="eth0"): - """ return the output of "ifconfig" run from inside the sliver. + """ + return the output of "ifconfig" run from inside the sliver. - side effects: adds "/usr/sbin" to sys.path + side effects: adds "/usr/sbin" to sys.path """ # See if setns is installed. If it's not then we're probably not running @@ -353,55 +320,6 @@ def get_sliver_ifconfig(slice_name, device="eth0"): return result -################################################### -# Author: Guilherme Sperb Machado -################################################### -# Basically this method is just a copy from "get_sliver_ifconfig()", but, -# instead, calls the "get_sliver_process_lxc()" method. -# Only for LXC! -# TODO: maybe merge both methods, and put the type as an argument, if -# it is LXC or vserver -################################################### -def get_sliver_ifconfig_lxc(slice_name, device="eth0"): - """ return the output of "ifconfig" run from inside the sliver. - - side effects: adds "/usr/sbin" to sys.path - """ - - # See if setns is installed. If it's not then we're probably not running - # LXC. - if not os.path.exists("/usr/sbin/setns.so"): - return None - - # setns is part of lxcsu and is installed to /usr/sbin - if not "/usr/sbin" in sys.path: - sys.path.append("/usr/sbin") - import setns - - (cgroup_fn, pid) = get_sliver_process_lxc(slice_name, "/sbin/init") - if (not cgroup_fn) or (not pid): - return None - - path = '/proc/%s/ns/net'%pid - - result = None - try: - setns.chcontext(path) - - args = ["/sbin/ifconfig", device] - sub = subprocess.Popen(args, stderr = subprocess.PIPE, stdout = subprocess.PIPE) - sub.wait() - - if (sub.returncode != 0): - logger.log("get_slice_ifconfig: error in ifconfig: %s" % sub.stderr.read()) - - result = sub.stdout.read() - finally: - setns.chcontext("/proc/1/ns/net") - - return result - - def get_sliver_ip(slice_name): ifconfig = get_sliver_ifconfig(slice_name) if not ifconfig: @@ -423,31 +341,31 @@ def get_sliver_ip(slice_name): # Only for LXC! ################################################### def get_sliver_ipv6(slice_name): - ifconfig = get_sliver_ifconfig_lxc(slice_name) + ifconfig = get_sliver_ifconfig(slice_name) if not ifconfig: return None,None - + # example: 'inet6 2001:67c:16dc:1302:5054:ff:fea7:7882 prefixlen 64 scopeid 0x0' prog = re.compile(r'inet6\s+(.*)\s+prefixlen\s+(\d+)\s+scopeid\s+(.+)') for line in ifconfig.split("\n"): - search = prog.search(line) - if search: - ipv6addr = search.group(1) - prefixlen = search.group(2) - return (ipv6addr,prefixlen) + search = prog.search(line) + if search: + ipv6addr = search.group(1) + prefixlen = search.group(2) + return (ipv6addr,prefixlen) return None,None -################################################### +################################################### # Author: Guilherme Sperb Machado ################################################### # Check if the address is a AF_INET6 family address ################################################### -def isValidIPv6(ipv6addr): - try: - socket.inet_pton(socket.AF_INET6, ipv6addr) - except socket.error: - return False - return True +def is_valid_ipv6(ipv6addr): + try: + socket.inet_pton(socket.AF_INET6, ipv6addr) + except socket.error: + return False + return True ### this returns the kind of virtualization on the node # either 'vs' or 'lxc' @@ -460,9 +378,9 @@ def get_node_virt (): except: pass logger.log("Computing virt..") - try: + try: if subprocess.call ([ 'vserver', '--help' ]) ==0: virt='vs' - else: virt='lxc' + else: virt='lxc' except: virt='lxc' with file(virt_stamp,"w") as f: @@ -484,23 +402,19 @@ def has_systemctl (): # This method was developed to support the ipv6 plugin # Only for LXC! ################################################### -def reboot_sliver(name): - type = 'sliver.LXC' - # connecting to the libvirtd - connLibvirt = Sliver_Libvirt.getConnection(type) - domains = connLibvirt.listAllDomains() - for domain in domains: - #ret = dir(domain) - #for method in ret: - # logger.log("ipv6: " + repr(method)) - #logger.log("tools: " + str(domain.name()) ) - try: - domain.destroy() - logger.log("tools: %s destroyed" % (domain.name()) ) - domain.create() - logger.log("tools: %s created" % (domain.name()) ) - except: - logger.log("tools: %s could not be rebooted" % (domain.name()) ) +def reboot_slivers(): + type = 'sliver.LXC' + # connecting to the libvirtd + connLibvirt = Sliver_Libvirt.getConnection(type) + domains = connLibvirt.listAllDomains() + for domain in domains: + try: + domain.destroy() + logger.log("tools: DESTROYED %s" % (domain.name()) ) + domain.create() + logger.log("tools: CREATED %s" % (domain.name()) ) + except: + logger.log("tools: FAILED to reboot %s" % (domain.name()) ) ################################################### # Author: Guilherme Sperb Machado @@ -509,48 +423,61 @@ def reboot_sliver(name): ################################################### def get_hosts_file_path(slicename): containerDir = os.path.join(sliver_lxc.Sliver_LXC.CON_BASE_DIR, slicename) - logger.log("tools: %s" % (containerDir) ) return os.path.join(containerDir, 'etc', 'hosts') ################################################### # Author: Guilherme Sperb Machado ################################################### -# Search if there is a specific ipv6 address in the /etc/hosts file of a given slice +# Search if there is a specific ipv6 address in the +# /etc/hosts file of a given slice +# If the parameter 'ipv6addr' is None, then search +# for any ipv6 address ################################################### def search_ipv6addr_hosts(slicename, ipv6addr): hostsFilePath = get_hosts_file_path(slicename) found=False try: - for line in fileinput.input(r'%s' % (hostsFilePath)): - if re.search(r'%s' % (ipv6addr), line): - found=True - fileinput.close() - return found + for line in fileinput.input(r'%s' % (hostsFilePath)): + if ipv6addr is not None: + if re.search(r'%s' % (ipv6addr), line): + found=True + else: + search = re.search(r'^(.*)\s+.*$', line) + if search: + ipv6candidate = search.group(1) + ipv6candidatestrip = ipv6candidate.strip() + valid = is_valid_ipv6(ipv6candidatestrip) + if valid: + found=True + fileinput.close() + return found except: - logger.log("tools: error when finding ipv6 address %s in the /etc/hosts file of slice=%s" % (ipv6addr, slicename) ) + logger.log("tools: FAILED to search %s in /etc/hosts file of slice=%s" % \ + (ipv6addr, slicename) ) ################################################### # Author: Guilherme Sperb Machado ################################################### -# Removes all ipv6 addresses from the /etc/hosts file of a given slice +# Removes all ipv6 addresses from the /etc/hosts +# file of a given slice ################################################### def remove_all_ipv6addr_hosts(slicename, node): hostsFilePath = get_hosts_file_path(slicename) try: - for line in fileinput.input(r'%s' % (hostsFilePath), inplace=True): - logger.log("tools: line=%s" % (line) ) - search = re.search(r'^(.*)\s+(%s|%s)$' % (node,'localhost'), line) - if search: - ipv6candidate = search.group(1) - ipv6candidatestrip = ipv6candidate.strip() - logger.log("tools: group1=%s" % (ipv6candidatestrip) ) - valid = isValidIPv6(ipv6candidatestrip) - if not valid: - logger.log("tools: address=%s not valid" % (ipv6candidatestrip) ) - print line, - fileinput.close() + for line in fileinput.input(r'%s' % (hostsFilePath), inplace=True): + search = re.search(r'^(.*)\s+(%s|%s)$' % (node,'localhost'), line) + if search: + ipv6candidate = search.group(1) + ipv6candidatestrip = ipv6candidate.strip() + valid = is_valid_ipv6(ipv6candidatestrip) + if not valid: + print line, + fileinput.close() + logger.log("tools: REMOVED IPv6 address from /etc/hosts file of slice=%s" % \ + (slicename) ) except: - logger.log("tools: could not delete the ipv6 address from the hosts file of slice=%s" % (slicename) ) + logger.log("tools: FAILED to remove the IPv6 address from /etc/hosts file of slice=%s" % \ + (slicename) ) ################################################### # Author: Guilherme Sperb Machado @@ -564,13 +491,14 @@ def add_ipv6addr_hosts_line(slicename, node, ipv6addr): #string = "127.0.0.1\tlocalhost\n192.168.100.179\tmyplc-node1-vm.mgmt.local\n" #string = "127.0.0.1\tlocalhost\n" try: - with open(hostsFilePath, "a") as file: - # debugging purposes only: - #file.write(string) - file.write(ipv6addr + " " + node + "\n") - file.close() + with open(hostsFilePath, "a") as file: + file.write(ipv6addr + " " + node + "\n") + file.close() + logger.log("tools: ADDED IPv6 address to /etc/hosts file of slice=%s" % \ + (slicename) ) except: - logger.log("tools: could not add the IPv6 address to the hosts file of slice=%s" % (slicename) ) + logger.log("tools: FAILED to add the IPv6 address to /etc/hosts file of slice=%s" % \ + (slicename) ) @@ -581,7 +509,7 @@ def add_ipv6addr_hosts_line(slicename, node, ipv6addr): # bottom line is, what actually needs to be called is # vs: vserver exec slicename command and its arguments # lxc: lxcsu slicename "command and its arguments" -# which, OK, is no big deal as long as the command is simple enough, +# which, OK, is no big deal as long as the command is simple enough, # but do not stretch it with arguments that have spaces or need quoting as that will become a nightmare def command_in_slice (slicename, argv): virt=get_node_virt()