Stop dstat at the end of a job

We should stop the dstat process that was previously started in toci_gate_test.sh, so that processes aren't left running from tripleo-ci jobs. Change-Id: I200fe5f99d371fdde3b20518ffd10197680d46dd
slagle · Feb 27, 2017 · e38da48 · e38da48
1 parent 03c3cdf
commit e38da48
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/scripts/common_functions.sh b/scripts/common_functions.sh
@@ -388,3 +388,6 @@ function subnodes_scp_deploy_env {
     done
 }
 
+function stop_dstat {
+	ps axjf | grep bin/dstat | grep -v grep | awk '{print $2;}' | sudo xargs -t -n 1 -r kill
+}
diff --git a/toci_instack_oooq_multinode.sh b/toci_instack_oooq_multinode.sh
@@ -93,7 +93,7 @@ export OOOQ_ARGS=" --working-dir ${OPT_WORKDIR} \
 
 # TODO(sshnaidm): when collect-logs role will have the same functionality,
 # replace postci function with this role (see in the end of file).
-trap "exit_val=\$?; [ \$exit_val != 0 ] && echo ERROR DURING PREVIOUS COMMAND ^^^ && echo 'See postci.txt in the logs directory for debugging details'; postci \$exit_val 2>&1 | ts '%Y-%m-%d %H:%M:%S.000 |' > $WORKSPACE/logs/postci.log 2>&1" EXIT
+trap "exit_val=\$?; [ \$exit_val != 0 ] && echo ERROR DURING PREVIOUS COMMAND ^^^ && echo 'See postci.txt in the logs directory for debugging details'; postci \$exit_val 2>&1 | ts '%Y-%m-%d %H:%M:%S.000 |' > $WORKSPACE/logs/postci.log 2>&1; stop_dstat" EXIT
 
 mkdir -p $WORKSPACE/logs