From: Lucia Guevgeozian Odizzio <lucia.guevgeozian_odizzio@inria.fr>
Date: Tue, 4 Feb 2014 13:59:24 +0000 (+0100)
Subject: Update method CleanProcess for linux node when user is root
X-Git-Tag: nepi-3.1.0~132
X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=commitdiff_plain;h=d9d06de63f0ccd7ede62824581efce85a6675a0a

Update method CleanProcess for linux node when user is root
---

diff --git a/src/nepi/resources/linux/node.py b/src/nepi/resources/linux/node.py
index 60fad69c..93a9d818 100644
--- a/src/nepi/resources/linux/node.py
+++ b/src/nepi/resources/linux/node.py
@@ -213,9 +213,6 @@ class LinuxNode(ResourceManager):
         # home directory at Linux host
         self._home_dir = ""
 
-        # list of pids before running the app if the user is root
-        self._pids = []
-        
         # lock to prevent concurrent applications on the same node,
         # to execute commands at the same time. There are potential
         # concurrency issues when using SSH to a same host from 
@@ -408,13 +405,17 @@ class LinuxNode(ResourceManager):
                 "sudo -S kill $(ps aux | grep '[n]epi' | awk '{print $2}') || /bin/true ; " +
                 "sudo -S killall -u %s || /bin/true ; " % self.get("username"))
         else:
-            pids_temp = []
             if self.state >= ResourceState.READY:
-                ps_aux = "ps aux |awk '{print $2}' |sort -u"
+                import pickle
+                pids = pickle.load(open("save.proc", "rb"))
+                pids_temp = dict()
+                ps_aux = "ps aux |awk '{print $2,$11}'"
                 (out, err), proc = self.execute(ps_aux)
-                pids_temp = out.split()
-                kill_pids = list(set(pids_temp) - set(self._pids))
-                kill_pids = ' '.join(kill_pids)
+                for line in out.strip().split("\n"):
+                    parts = line.strip().split(" ")
+                    pids_temp[parts[0]] = parts[1]
+                kill_pids = set(pids_temp.items()) - set(pids.items())
+                kill_pids = ' '.join(dict(kill_pids).keys())
 
                 cmd = ("killall tcpdump || /bin/true ; " +
                     "kill $(ps aux | grep '[n]epi' | awk '{print $2}') || /bin/true ; " +