From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 12 Sep 2013 11:43:10 +0000 (+0200)
Subject: omf plugin: triggers trigger script, but does not communicate with it - so, no hanging
X-Git-Tag: nodemanager-5.2-8~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4cac061c0af2d895895afd3bb08092af3289c0cf;hp=e30877f5113568275fb9aace92d819d92bd13393;p=nodemanager.git

omf plugin: triggers trigger script, but does not communicate with it - so, no hanging
script stdout and stderr redirected in /var/log/<script>.log in sliver space
---

diff --git a/plugins/omf_resctl.py b/plugins/omf_resctl.py
index fb32834..7b9b1eb 100644
--- a/plugins/omf_resctl.py
+++ b/plugins/omf_resctl.py
@@ -113,17 +113,20 @@ 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
+                # in addition there is a requirement to pretend we run as a login shell
+                # hence sudo -i
                 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)
-                (out,err)=sp.communicate()
-                retcod=sp.returncode
-                # we don't wait for that, try to display a retcod for info purpose only
-                # might be None if that config script lasts or hangs whatever
-                logger.log("omf_resctl: %s: called OMF rc control script (imm. retcod=%r)"%(slicename,retcod))
-                logger.log("omf_resctl: got stdout\n%s"%out)
-                logger.log("omf_resctl: got stderr\n%s"%err)
+                log_filename = "/vservers/%s/var/log/%s.log"%(slicename,omf_rc_trigger_script)
+                logger.log("omf_resctl: starting %s"%to_run)
+                logger.log("redirected into %s"%log_filename)
+                logger.log("*not* waiting for completion..")
+                with open(log_filename,"a") as log_file:
+                    subprocess.Popen(to_run, stdout=log_file,stderr=subprocess.STDOUT)
+                # a first version tried to 'communicate' on that subprocess instance
+                # but that tended to create deadlocks in some cases
+                # causing nodemanager to stall...
+                # we're only losing the child's retcod, no big deal
             except:
                 import traceback
                 traceback.print_exc()