Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Test: Clean up after valgrind runs

  • Loading branch information...
commit 7da5b1b053cab1017d98843d041d4bb54f6e323c 1 parent f8b62b8
@beekhof authored
Showing with 4 additions and 3 deletions.
  1. +3 −2 extra/cluster-clean
  2. +1 −1  mcp/pacemaker.sysconfig
View
5 extra/cluster-clean
@@ -38,7 +38,7 @@ if [ $kill != 0 ]; then
echo "Cleaning processes"
cluster-helper $target -- "killall -q -9 corosync aisexec heartbeat pacemakerd pacemaker-remoted ccm stonithd ha_logd lrmd crmd pengine attrd pingd mgmtd cib fenced dlm_controld gfs_controld" &> /dev/null
- cluster-helper $target -- 'kill -q -9 `pidof valgrind`' &> /dev/null
+ cluster-helper $target -- 'kill -9 `pidof valgrind`' &> /dev/null
# Bah. Force systemd to actually look at the process and realize its dead"
cluster-helper $target -- "service corosync stop" &> /dev/null
@@ -60,6 +60,7 @@ log_files="$log_files pacemaker.log"
state_files=""
state_files="$state_files 'cib.xml*'"
+state_files="$state_files 'valgrind-*'"
state_files="$state_files 'cib-*'"
state_files="$state_files 'core.*'"
state_files="$state_files hostcache"
@@ -76,7 +77,7 @@ done
cluster-helper $target -- "find /dev/shm -name 'qb-*' -exec rm -f \{\} \;"
cluster-helper $target -- "find /var/lib/pacemaker/blackbox -name '*.*' -exec rm -f \{\} \;"
-cluster-helper $target -- "find /tmp -name 'cts-*.valgrind' -exec rm -f \{\} \;"
+cluster-helper $target -- "find /tmp -name '*.valgrind' -exec rm -f \{\} \;"
cluster-helper $target -- service rsyslog restart 2>&1 > /dev/null
cluster-helper $target -- logger -i -p daemon.info __clean_logs__
View
2  mcp/pacemaker.sysconfig
@@ -85,4 +85,4 @@
# PCMK_valgrind_enabled=cib,crmd
# PCMK_callgrind_enabled=yes
# PCMK_callgrind_enabled=cib,crmd
-# VALGRIND_OPTS="--leak-check=full --trace-children=no --num-callers=25 --log-file=/tmp/pacemaker-%p.valgrind"
+# VALGRIND_OPTS="--leak-check=full --trace-children=no --num-callers=25 --log-file=/var/lib/pacemaker/valgrind-%p"
Please sign in to comment.
Something went wrong with that request. Please try again.