From 66db0978b275eec1dbffc862e68715a1b63dd31d Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 10 Jul 2013 11:10:41 +0200 Subject: [PATCH] fix command_in_slice - was working in lxc but not vs --- plugins/omf_resctl.py | 2 +- tools.py | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/plugins/omf_resctl.py b/plugins/omf_resctl.py index a0f14ab..1f17453 100644 --- a/plugins/omf_resctl.py +++ b/plugins/omf_resctl.py @@ -106,7 +106,7 @@ def GetSlivers(data, conf = None, plc = None): try: fetch_trigger_script_if_missing (slicename) # the trigger script actually needs to be run in the slice context of course - slice_command = ["sudo -i %s"%omf_rc_trigger_script] + slice_command = [ "sudo", "-i", omf_rc_trigger_script ] to_run = tools.command_in_slice (slicename, slice_command) logger.log("command_in_slice: %s"%to_run) sp=subprocess.Popen(to_run, stdout=subprocess.PIPE,stderr=subprocess.STDOUT) diff --git a/tools.py b/tools.py index a53c158..dbfa55f 100644 --- a/tools.py +++ b/tools.py @@ -309,15 +309,22 @@ def get_node_virt (): f.write(virt) return virt +# 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): - # with vserver this can be done using vserver .. exec - # with lxc this is less clear as we are still discussing how lxcsu should behave - # ideally we'd need to run lxcsu .. virt=get_node_virt() if virt=='vs': return [ 'vserver', slicename, 'exec', ] + argv elif virt=='lxc': - return [ 'lxcsu', slicename, ] + argv + # 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 -- 2.43.0