--- coreservers_replicate 2014-11-24 11:38:09.000000000 +0100 +++ coreservers_replicate.new 2014-11-25 13:22:53.000000000 +0100 @@ -1385,7 +1385,7 @@ fi REPID="$(awk -F':' '{print $6}' /etc/passwd | grep replicator)/.ssh/id_rsa" REMOTE_REPLICATE_COMMANDS=$(printf "${COMMANDS_IN_JOB}" | tr '|' '\n' | grep 'ssh' | sed -E -e "s/${SSH} ${rh}//" -e 's/.* sudo//' -e 's/^ //' | tr '\n' '|' | sed -E "s/\|$//") - REMOTE_REPLICATE_PROCESSES=$(${SSH} -i ${REPID} replicator@$rh ps -a -x -o pid,%cpu,command | egrep "${REMOTE_REPLICATE_COMMANDS}" | egrep -v 'egrep| sudo ') + REMOTE_REPLICATE_PROCESSES=$(${SSH} -i ${REPID} replicator@$rh ps -a -x -o pid,%cpu,command | egrep "zfs send -vRi|zfs recv -vdn|${REMOTE_REPLICATE_COMMANDS}" | egrep -v 'egrep| sudo ') if [ "${DESTROYING}" = "-d" ]; then USED_CPU=$(printf "${REMOTE_REPLICATE_PROCESSES}" | egrep 'zfs destroy|zfs list' | awk '{sub(/\./,"");print$2}') else @@ -1556,7 +1556,7 @@ } if [ $(echo ${LAST_RUN_JOB} | wc -w) -ne 0 ]; then if [ $(ps ax | egrep "${LAST_RUN_JOB}" | grep -v egrep -c) -ne 0 ]; then - REPLICATE_PROCESSES=$(ps -a -x -o pid,%cpu,command | egrep "${LAST_RUN_JOB}|${COMMANDS_IN_JOB}" | grep -v egrep) + REPLICATE_PROCESSES=$(ps -a -x -o pid,%cpu,command | egrep "zfs send -vRi|zfs recv -vdn|${LAST_RUN_JOB}|${COMMANDS_IN_JOB}" | grep -v egrep) confirm_replicate_status else