From fe1b334d9737a5205536a41c4bac8e311dbb31ef Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Tue, 23 Aug 2016 22:25:30 +0200 Subject: [PATCH 1/7] loging when removing old programs --- cmake_targets/autotests/tools/remove_old_programs.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake_targets/autotests/tools/remove_old_programs.bash b/cmake_targets/autotests/tools/remove_old_programs.bash index 33c44c32c5..eca6cf4c98 100755 --- a/cmake_targets/autotests/tools/remove_old_programs.bash +++ b/cmake_targets/autotests/tools/remove_old_programs.bash @@ -1,6 +1,8 @@ #!/bin/bash #$1 programs to be killed and checked +echo "removing old programs..." +echo "args = $1" ps -aux |grep -E -i $1| awk '{print $2}' | sudo xargs kill -9 var=`ps -aux |grep -E -i $1` From f764aea62d9bcde8b80af819bf150100e82bd8b2 Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Tue, 23 Aug 2016 22:46:03 +0200 Subject: [PATCH 2/7] logging for killing old programs --- cmake_targets/autotests/tools/remove_old_programs.bash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake_targets/autotests/tools/remove_old_programs.bash b/cmake_targets/autotests/tools/remove_old_programs.bash index eca6cf4c98..d494847b41 100755 --- a/cmake_targets/autotests/tools/remove_old_programs.bash +++ b/cmake_targets/autotests/tools/remove_old_programs.bash @@ -3,6 +3,9 @@ #$1 programs to be killed and checked echo "removing old programs..." echo "args = $1" +echo "programs to be killed" +ps -aux |grep -E -i $1 + ps -aux |grep -E -i $1| awk '{print $2}' | sudo xargs kill -9 var=`ps -aux |grep -E -i $1` From d65c4a25a33ea02954511af83d7c3ce58d6d0630 Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Wed, 24 Aug 2016 00:01:14 +0200 Subject: [PATCH 3/7] bugfix for script to kill old programs --- .../autotests/tools/remove_old_programs.bash | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/cmake_targets/autotests/tools/remove_old_programs.bash b/cmake_targets/autotests/tools/remove_old_programs.bash index d494847b41..3352dc7053 100755 --- a/cmake_targets/autotests/tools/remove_old_programs.bash +++ b/cmake_targets/autotests/tools/remove_old_programs.bash @@ -3,12 +3,19 @@ #$1 programs to be killed and checked echo "removing old programs..." echo "args = $1" +echo "script name = $0" +filename=$(basename "$0") echo "programs to be killed" -ps -aux |grep -E -i $1 +echo "bash PID = $$" +pid='$$' +#we need to remove current program and grip as we kill ourselves otherwise :) +var=`ps -aux |grep -E -i $1 | awk '{print $2}'` -ps -aux |grep -E -i $1| awk '{print $2}' | sudo xargs kill -9 +echo $var -var=`ps -aux |grep -E -i $1` +echo "$var" | sed 's/'$$'/ /' | sudo xargs kill -9 + +var=`ps -aux |grep -E -i $1| grep -E -v '$filename|grep|$$'` echo $var if [ -n "$var" ]; then echo 'Match found'; else echo 'Match not found' ;fi From 4b6f457361c50d4a227c5ed11539ff66bc356fa1 Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Wed, 24 Aug 2016 02:57:51 +0200 Subject: [PATCH 4/7] bugfix for script to remove old programs --- .../autotests/tools/remove_old_programs.bash | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/cmake_targets/autotests/tools/remove_old_programs.bash b/cmake_targets/autotests/tools/remove_old_programs.bash index 3352dc7053..85aa213883 100755 --- a/cmake_targets/autotests/tools/remove_old_programs.bash +++ b/cmake_targets/autotests/tools/remove_old_programs.bash @@ -5,17 +5,19 @@ echo "removing old programs..." echo "args = $1" echo "script name = $0" filename=$(basename "$0") -echo "programs to be killed" -echo "bash PID = $$" -pid='$$' -#we need to remove current program and grip as we kill ourselves otherwise :) -var=`ps -aux |grep -E -i $1 | awk '{print $2}'` +echo "filename = $filename" +echo "programs to be killed...$1" -echo $var +echo "bash PID = $$" +pid="$$" +echo "pid = $pid" -echo "$var" | sed 's/'$$'/ /' | sudo xargs kill -9 +echo "Killing programs now..." +ps -aux |grep -E -i $1 |awk '{print $2}'| tr '\n' ' ' | sed "s/$pid/ /" | sudo xargs kill -9 + +echo "checking for old programs..." +var=`ps -aux |grep -E -i '$1' |grep -Ev 'grep' | grep -Ev '$filename'` -var=`ps -aux |grep -E -i $1| grep -E -v '$filename|grep|$$'` echo $var if [ -n "$var" ]; then echo 'Match found'; else echo 'Match not found' ;fi From 300fc152b1a58b6288b4587468699992ceee538c Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Wed, 24 Aug 2016 03:51:41 +0200 Subject: [PATCH 5/7] kill programs only if they exist to avoid kill signal to main python script --- cmake_targets/autotests/tools/remove_old_programs.bash | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake_targets/autotests/tools/remove_old_programs.bash b/cmake_targets/autotests/tools/remove_old_programs.bash index 85aa213883..3b677ca3ad 100755 --- a/cmake_targets/autotests/tools/remove_old_programs.bash +++ b/cmake_targets/autotests/tools/remove_old_programs.bash @@ -13,7 +13,11 @@ pid="$$" echo "pid = $pid" echo "Killing programs now..." -ps -aux |grep -E -i $1 |awk '{print $2}'| tr '\n' ' ' | sed "s/$pid/ /" | sudo xargs kill -9 +var=`ps -aux |grep -E -i $1 |awk '{print $2}'| tr '\n' ' ' | sed "s/$pid/ /"` +echo $var +if [ -n "$var" ] ; then sudo kill -9 $var ; fi + +#| sudo xargs kill -9 echo "checking for old programs..." var=`ps -aux |grep -E -i '$1' |grep -Ev 'grep' | grep -Ev '$filename'` From f9cf8e5e6bda339c66475f9607972531b7cc6a2d Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Wed, 24 Aug 2016 04:07:07 +0200 Subject: [PATCH 6/7] fix for script that kills old programs --- cmake_targets/autotests/tools/remove_old_programs.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake_targets/autotests/tools/remove_old_programs.bash b/cmake_targets/autotests/tools/remove_old_programs.bash index 3b677ca3ad..0c43a44538 100755 --- a/cmake_targets/autotests/tools/remove_old_programs.bash +++ b/cmake_targets/autotests/tools/remove_old_programs.bash @@ -13,7 +13,7 @@ pid="$$" echo "pid = $pid" echo "Killing programs now..." -var=`ps -aux |grep -E -i $1 |awk '{print $2}'| tr '\n' ' ' | sed "s/$pid/ /"` +var=`ps -aux |grep -E -i '$1' |awk '{print $2}'| tr '\n' ' ' | sed "s/$pid/ /"` echo $var if [ -n "$var" ] ; then sudo kill -9 $var ; fi From 82f7f52e824e65f3ede68c657e17f05b47a9227e Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Wed, 24 Aug 2016 04:42:17 +0200 Subject: [PATCH 7/7] fix to avoid killing python script --- .../autotests/tools/remove_old_programs.bash | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cmake_targets/autotests/tools/remove_old_programs.bash b/cmake_targets/autotests/tools/remove_old_programs.bash index 0c43a44538..c5c26e3752 100755 --- a/cmake_targets/autotests/tools/remove_old_programs.bash +++ b/cmake_targets/autotests/tools/remove_old_programs.bash @@ -13,14 +13,19 @@ pid="$$" echo "pid = $pid" echo "Killing programs now..." -var=`ps -aux |grep -E -i '$1' |awk '{print $2}'| tr '\n' ' ' | sed "s/$pid/ /"` -echo $var + +ps -aux |grep -E -i -w "$1" + +var=`ps -aux |grep -E -i -w "$1" |awk '{print $2}'| tr '\n' ' ' | sed "s/$pid/ /"` +echo "Killing processes...$var" +#var=`ps -aux |grep -E -i '$1' |awk '{print $2}'| tr '\n' ' ' | sed "s/$pid/ /"` +#echo $var if [ -n "$var" ] ; then sudo kill -9 $var ; fi #| sudo xargs kill -9 echo "checking for old programs..." -var=`ps -aux |grep -E -i '$1' |grep -Ev 'grep' | grep -Ev '$filename'` +var=`ps -aux |grep -E -i -w '$1' |grep -Ev 'grep' | grep -Ev '$filename'` echo $var if [ -n "$var" ]; then echo 'Match found'; else echo 'Match not found' ;fi