X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tools.py;h=02e2ab9b7193b17f8f9aef7e9e6ccd3f9f65215a;hb=9e6b9c1ea9e020c55c85b433bac47231d63e9ffd;hp=feb3e33ea9bfc955a39bf9057c242459104d890e;hpb=1634e61085a950b5e60b7d304d88f01c6ffde758;p=nodemanager.git

diff --git a/tools.py b/tools.py
index feb3e33..02e2ab9 100644
--- a/tools.py
+++ b/tools.py
@@ -9,6 +9,7 @@ import threading
 import subprocess
 import shutil
 import sys
+import signal
 
 import logger
 
@@ -204,31 +205,31 @@ def get_sliver_process(slice_name, process_cmdline):
         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()
+        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)
+        # 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()
-                    path = l.split(':')[0]
-                    comp = l.rsplit(':')[-1]
-                    slice_name_check = comp.rsplit('/')[-1]
-
-                    if (slice_name_check == slice_name):
-                            slice_path = path
-                            pid = slice_path.split('/')[2]
-                            cmdline = open('/proc/%s/cmdline'%pid).read().rstrip('\n\x00')
-                            if (cmdline == process_cmdline):
-                                    cgroup_fn = slice_path
-                                    break
-            except:
+        try:
+            l = e.rstrip()
+            path = l.split(':')[0]
+            comp = l.rsplit(':')[-1]
+            slice_name_check = comp.rsplit('/')[-1]
+
+            if (slice_name_check == slice_name):
+                slice_path = path
+                pid = slice_path.split('/')[2]
+                cmdline = open('/proc/%s/cmdline'%pid).read().rstrip('\n\x00')
+                if (cmdline == process_cmdline):
+                    cgroup_fn = slice_path
                     break
+        except:
+            break
 
     if (not cgroup_fn) or (not pid):
         logger.log("get_sliver_process: process %s not running in slice %s" % (process_cmdline, slice_name))
@@ -289,3 +290,60 @@ def get_sliver_ip(slice_name):
 
     return None
 
+### this returns the kind of virtualization on the node
+# either 'vs' or 'lxc'
+# also caches it in /etc/planetlab/virt for next calls
+# could be promoted to core nm if need be
+virt_stamp="/etc/planetlab/virt"
+def get_node_virt ():
+    try:
+        return file(virt_stamp).read().strip()
+    except:
+        pass
+    logger.log("Computing virt..")
+    try: 
+        if subprocess.call ([ 'vserver', '--help' ]) ==0: virt='vs'
+        else:                                             virt='lxc'      
+    except:
+        virt='lxc'
+    with file(virt_stamp,"w") as f:
+        f.write(virt)
+    return virt
+
+### this return True or False to indicate that systemctl is present on that box
+# cache result in memory as _has_systemctl
+_has_systemctl=None
+def has_systemctl ():
+    global _has_systemctl
+    if _has_systemctl is None:
+        _has_systemctl = (subprocess.call([ 'systemctl', '--help' ]) == 0)
+    return _has_systemctl
+
+# how to run a command in a slice
+# now this is a painful matter
+# the problem is with capsh that forces a bash command to be injected in its exec'ed command
+# so because lxcsu uses capsh, you cannot exec anything else than bash
+# 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, 
+# 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()
+    if virt=='vs':
+        return [ 'vserver', slicename, 'exec', ] + argv
+    elif virt=='lxc':
+        # wrap up argv in a single string for -c
+        return [ 'lxcsu', slicename, ] + [ " ".join(argv) ]
+    logger.log("command_in_slice: WARNING: could not find a valid virt")
+    return argv
+
+####################
+def init_signals ():
+    def handler (signum, frame):
+        logger.log("Received signal %d - exiting"%signum)
+        os._exit(1)
+    signal.signal(signal.SIGHUP,handler)
+    signal.signal(signal.SIGQUIT,handler)
+    signal.signal(signal.SIGINT,handler)
+    signal.signal(signal.SIGTERM,handler)