lvm2-commits June 2017

lvm2-commits@lists.fedorahosted.org

8 participants
204 discussions

master - tests: aux.sh array assing
by Zdenek Kabelac 29 Jun '17

29 Jun '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ec02307e952ef29d4a28f… Commit: ec02307e952ef29d4a28fe134c807ac79a61908a Parent: 8a912d6dbcc34ce2b76a0104c39de7aa0480c512 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 29 20:45:46 2017 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 29 22:23:17 2017 +0200 tests: aux.sh array assing Assigning an array to a string! Assign as array, or use * instead of @ to concatenate. --- test/lib/aux.sh | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index e82d698..5e7340e 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -595,7 +595,7 @@ teardown() { prepare_loop() { local size=${1=32} - local losetup_params=${@:2} + local losetup_params=( ${@:2} ) local i local slash @@ -620,9 +620,9 @@ prepare_loop() { local LOOPFILE="$PWD/test.img" rm -f "$LOOPFILE" dd if=/dev/zero of="$LOOPFILE" bs=$((1024*1024)) count=0 seek=$(( size + 1 )) 2> /dev/null - if LOOP=$(losetup ${losetup_params} -s -f "$LOOPFILE" 2>/dev/null); then + if LOOP=$(losetup "${losetup_params[@]}" -s -f "$LOOPFILE" 2>/dev/null); then : - elif LOOP=$(losetup -f) && losetup ${losetup_params} "$LOOP" "$LOOPFILE"; then + elif LOOP=$(losetup -f) && losetup "${losetup_params[@]}" "$LOOP" "$LOOPFILE"; then # no -s support : else @@ -633,7 +633,7 @@ prepare_loop() { local dev="$DM_DEV_DIR/loop$slash$i" ! losetup "$dev" >/dev/null 2>&1 || continue # got a free - losetup ${losetup_params} "$dev" "$LOOPFILE" + losetup "${losetup_params[@]}" "$dev" "$LOOPFILE" LOOP=$dev break done @@ -652,7 +652,7 @@ prepare_loop() { # - scripts must take care not to use a DEV_SIZE that will enduce OOM-killer prepare_scsi_debug_dev() { local DEV_SIZE=$1 - local SCSI_DEBUG_PARAMS=${@:2} + local SCSI_DEBUG_PARAMS=( ${@:2} ) local DEBUG_DEV rm -f debug.log strace.log @@ -668,7 +668,7 @@ prepare_scsi_debug_dev() { # NOTE: it will _never_ make sense to pass num_tgts param; # last param wins.. so num_tgts=1 is imposed touch SCSI_DEBUG_DEV - modprobe scsi_debug dev_size_mb="$DEV_SIZE" $SCSI_DEBUG_PARAMS num_tgts=1 || skip + modprobe scsi_debug dev_size_mb="$DEV_SIZE" "${SCSI_DEBUG_PARAMS[@]}" num_tgts=1 || skip for i in {1..20} ; do DEBUG_DEV="/dev/$(grep -H scsi_debug /sys/block/*/device/model | cut -f4 -d /)" @@ -861,14 +861,14 @@ common_dev_() { delay) read_ms=${3:-0} write_ms=${4:-0} - offsets=${@:5} + offsets=( ${@:5} ) if test "$read_ms" -eq 0 -a "$write_ms" -eq 0 ; then - offsets= + offsets=( ) else - test -z "${offsets[@]}" && offsets="0:" + test -z "${offsets[@]}" && offsets=( "0:" ) fi ;; - error|zero) offsets=${@:3} - test -z "${offsets[@]}" && offsets="0:" ;; + error|zero) offsets=( ${@:3} ) + test -z "${offsets[@]}" && offsets=( "0:" ) ;; esac local pos

1 0

master - tests: aux.sh separately assign
by Zdenek Kabelac 29 Jun '17

29 Jun '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8a912d6dbcc34ce2b76a0… Commit: 8a912d6dbcc34ce2b76a0104c39de7aa0480c512 Parent: 4f63b7e9c130ce1de12c38fb794fe7b3142dc9bd Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 29 12:07:34 2017 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 29 22:23:17 2017 +0200 tests: aux.sh separately assign Declare and assign separately to avoid masking return values. --- test/lib/aux.sh | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index b130560..e82d698 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -695,8 +695,9 @@ prepare_md_dev() { local rchunk=$2 local rdevs=$3 - local maj=$(mdadm --version 2>&1) || skip "mdadm tool is missing!" + local maj local mddev + maj=$(mdadm --version 2>&1) || skip "mdadm tool is missing!" cleanup_md_dev @@ -746,8 +747,8 @@ cleanup_md_dev() { test -f MD_DEV || return 0 local IFS=$IFS_NL - local dev=$(< MD_DEV) - + local dev + dev=$(< MD_DEV) udev_wait mdadm --stop "$dev" || true test "$DM_DEV_DIR" != "/dev" && rm -f "$DM_DEV_DIR/$(basename "$dev")" @@ -972,7 +973,8 @@ enable_dev() { rm -f debug.log strace.log init_udev_transaction for dev in "$@"; do - local name=$(echo "$dev" | sed -e 's,.*/,,') + local name + name=$(echo "$dev" | sed -e 's,.*/,,') dmsetup create -u "TEST-$name" "$name" "$name.table" 2>/dev/null || \ dmsetup load "$name" "$name.table" # using device name (since device path does not exists yes with udev) @@ -999,7 +1001,8 @@ restore_from_devtable() { rm -f debug.log strace.log init_udev_transaction for dev in "$@"; do - local name=$(echo "$dev" | sed -e 's,.*/,,') + local name + name=$(echo "$dev" | sed -e 's,.*/,,') dmsetup load "$name" "$name.devtable" dmsetup resume "$name" done @@ -1381,7 +1384,8 @@ target_at_least() { esac fi - local version=$(dmsetup targets 2>/dev/null | grep "${1##dm-} " 2>/dev/null) + local version + version=$(dmsetup targets 2>/dev/null | grep "${1##dm-} " 2>/dev/null) version=${version##* v} version_at_least "$version" "${@:2}" || { @@ -1397,7 +1401,8 @@ target_at_least() { # e.g. driver_at_least 4 33 # driver_at_least() { - local version=$(dmsetup version | tail -1 2>/dev/null) + local version + version=$(dmsetup version | tail -1 2>/dev/null) version=${version##*:} version_at_least "$version" "$@" || { echo "Found driver version $version, but requested" "$@" "." >&2 @@ -1478,7 +1483,8 @@ have_cache() { } have_tool_at_least() { - local version=$($1 -V 2>/dev/null) + local version + version=$("$1" -V 2>/dev/null) version=${version%%-*} shift @@ -1515,7 +1521,8 @@ awk_parse_init_count_in_lvmpolld_dump() { } check_lvmpolld_init_rq_count() { - local ret=$(awk -v vvalue="$2" -v vkey="${3:-lvname}" "$(awk_parse_init_count_in_lvmpolld_dump)" lvmpolld_dump.txt) + local ret + ret=$(awk -v vvalue="$2" -v vkey="${3:-lvname}" "$(awk_parse_init_count_in_lvmpolld_dump)" lvmpolld_dump.txt) test "$ret" -eq "$1" || { echo "check_lvmpolld_init_rq_count failed. Expected $1, got $ret" return 1

1 0

master - tests: aux.sh using grep -c
by Zdenek Kabelac 29 Jun '17

29 Jun '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4f63b7e9c130ce1de12c3… Commit: 4f63b7e9c130ce1de12c38fb794fe7b3142dc9bd Parent: b16ca76260bbfb950ee7246a249ea7e4987520af Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 29 07:59:11 2017 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 29 22:23:17 2017 +0200 tests: aux.sh using grep -c Consider using grep -c instead of grep|wc -l. --- test/lib/aux.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index a3e2b70..b130560 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -423,7 +423,7 @@ teardown_devs_prefixed() { if test -f REMOVE_FAILED; then local num_devs local num_remaining_devs=999 - while num_devs=$(dm_table | grep "$prefix" | wc -l) && \ + while num_devs=$(dm_table | grep -c "$prefix") && \ test "$num_devs" -lt "$num_remaining_devs" -a "$num_devs" -ne 0; do test "$stray" -eq 0 || echo "Removing $num_devs stray mapped devices with names beginning with $prefix: " # HACK: sort also by minors - so we try to close 'possibly later' created device first

1 0

master - tests: aux.sh no mixing string
by Zdenek Kabelac 29 Jun '17

29 Jun '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b16ca76260bbfb950ee72… Commit: b16ca76260bbfb950ee7246a249ea7e4987520af Parent: 44e530b919d72005e10970c13699c7fbfd736ce9 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 29 07:57:59 2017 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 29 22:23:17 2017 +0200 tests: aux.sh no mixing string Argument mixes string and array. Use * or separate argument. --- test/lib/aux.sh | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 816de9a..a3e2b70 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -398,7 +398,7 @@ teardown_devs_prefixed() { local mounts=( $(grep "$prefix" /proc/mounts | cut -d' ' -f1) ) if test ${#mounts[@]} -gt 0; then - test "$stray" -eq 0 || echo "Removing stray mounted devices containing $prefix: ${mounts[@]}" + test "$stray" -eq 0 || echo "Removing stray mounted devices containing $prefix:" "${mounts[@]}" if umount -fl "${mounts[@]}"; then udev_wait fi @@ -461,7 +461,7 @@ teardown_devs() { local stray_loops=( $(losetup -a | grep "$COMMON_PREFIX" | cut -d: -f1) ) test ${#stray_loops[@]} -eq 0 || { teardown_devs_prefixed "$COMMON_PREFIX" 1 - echo "Removing stray loop devices containing $COMMON_PREFIX: ${stray_loops[@]}" + echo "Removing stray loop devices containing $COMMON_PREFIX:" "${stray_loops[@]}" for i in "${stray_loops[@]}" ; do test ! -b "$i" || losetup -d "$i" || true ; done # Leave test when udev processed all removed devices udev_wait @@ -1400,7 +1400,7 @@ driver_at_least() { local version=$(dmsetup version | tail -1 2>/dev/null) version=${version##*:} version_at_least "$version" "$@" || { - echo "Found driver version $version, but requested $@." >&2 + echo "Found driver version $version, but requested" "$@" "." >&2 return 1 } } @@ -1424,7 +1424,7 @@ have_thin() { CONF[2]="global/thin_repair_executable = \"\"" fi if test ${#CONF[@]} -ne 0 ; then - echo "TEST WARNING: Reconfiguring ${CONF[@]}" + echo "TEST WARNING: Reconfiguring" "${CONF[@]}" lvmconf "${CONF[@]}" fi } @@ -1472,7 +1472,7 @@ have_cache() { CONF[2]="global/cache_repair_executable = \"\"" fi if test ${#CONF[@]} -ne 0 ; then - echo "TEST WARNING: Reconfiguring ${CONF[@]}" + echo "TEST WARNING: Reconfiguring" "${CONF[@]}" lvmconf "${CONF[@]}" fi }

1 0

master - tests: aux.sh drop unnecessary $
by Zdenek Kabelac 29 Jun '17

29 Jun '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=44e530b919d72005e1097… Commit: 44e530b919d72005e10970c13699c7fbfd736ce9 Parent: 474e3cd66d7be358f54674f1ea449adf47ab1a61 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 29 00:17:59 2017 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 29 22:23:16 2017 +0200 tests: aux.sh drop unnecessary $ $/${} is unnecessary on arithmetic variables. --- test/lib/aux.sh | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 863f3da..816de9a 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -481,7 +481,7 @@ kill_sleep_kill_() { wait=0 while ps "$pid" > /dev/null && test "$wait" -le 10; do sleep .5 - wait=$(($wait + 1)) + wait=$(( wait + 1 )) done fi } @@ -513,7 +513,7 @@ kill_tagged_processes() { for pid in $pids ; do while ps "$pid" > /dev/null && test "$wait" -le 10; do sleep .2 - wait=$(($wait + 1)) + wait=$(( wait + 1 )) done test "$wait" -le 10 || kill -KILL "$pid" 2>/dev/null || true done @@ -619,7 +619,7 @@ prepare_loop() { local LOOPFILE="$PWD/test.img" rm -f "$LOOPFILE" - dd if=/dev/zero of="$LOOPFILE" bs=$((1024*1024)) count=0 seek=$(($size + 1)) 2> /dev/null + dd if=/dev/zero of="$LOOPFILE" bs=$((1024*1024)) count=0 seek=$(( size + 1 )) 2> /dev/null if LOOP=$(losetup ${losetup_params} -s -f "$LOOPFILE" 2>/dev/null); then : elif LOOP=$(losetup -f) && losetup ${losetup_params} "$LOOP" "$LOOPFILE"; then @@ -792,12 +792,12 @@ prepare_devs() { fi touch DEVICES - prepare_backing_dev $(($n*$devsize)) + prepare_backing_dev $(( n * devsize )) # shift start of PV devices on /dev/loopXX by 1M not diff LOOP BACKING_DEV >/dev/null 2>&1 || shift=2048 echo -n "## preparing $n devices..." - local size=$(($devsize*2048)) # sectors + local size=$(( devsize * 2048 )) # sectors local count=0 rm -f CREATE_FAILED init_udev_transaction @@ -805,8 +805,8 @@ prepare_devs() { local name="${PREFIX}$pvname$i" local dev="$DM_DEV_DIR/mapper/$name" DEVICES[$count]=$dev - count=$(( $count + 1 )) - echo 0 $size linear "$BACKING_DEV" $((($i-1)*$size + $shift)) > "$name.table" + count=$(( count + 1 )) + echo 0 $size linear "$BACKING_DEV" $(( ( i - 1 ) * size + shift )) > "$name.table" dmsetup create -u "TEST-$name" "$name" "$name.table" || touch CREATE_FAILED & test -f CREATE_FAILED && break; done @@ -881,25 +881,25 @@ common_dev_() { for fromlen in "${offsets[@]}"; do from=${fromlen%%:*} len=${fromlen##*:} - test -n "$len" || len=$(($size - $from)) - diff=$(($from - $pos)) + test -n "$len" || len=$(( size - from )) + diff=$(( from - pos )) if test $diff -gt 0 ; then - echo "$pos $diff $type $pvdev $(($pos + $offset))" - pos=$(($pos + $diff)) + echo "$pos $diff $type $pvdev $(( pos + offset ))" + pos=$(( pos + diff )) elif test $diff -lt 0 ; then die "Position error" fi case "$tgtype" in delay) - echo "$from $len delay $pvdev $(($pos + $offset)) $read_ms $pvdev $(($pos + $offset)) $write_ms" ;; + echo "$from $len delay $pvdev $(( pos + offset )) $read_ms $pvdev $(( pos + offset )) $write_ms" ;; error|zero) echo "$from $len $tgtype" ;; esac - pos=$(($pos + $len)) + pos=$(( pos + len )) done > "$name.devtable" - diff=$(($size - $pos)) - test "$diff" -gt 0 && echo "$pos $diff $type $pvdev $(($pos + $offset))" >>"$name.devtable" + diff=$(( size - pos )) + test "$diff" -gt 0 && echo "$pos $diff $type $pvdev $(( pos + offset ))" >>"$name.devtable" init_udev_transaction dmsetup load "$name" "$name.devtable"

1 0

master - tests: aux.sh use pgrep
by Zdenek Kabelac 29 Jun '17

29 Jun '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=474e3cd66d7be358f5467… Commit: 474e3cd66d7be358f54674f1ea449adf47ab1a61 Parent: 72a58ce4b0f68f6e45ae30606fe5af21caa42b43 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 29 00:04:47 2017 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 29 22:23:16 2017 +0200 tests: aux.sh use pgrep --- test/lib/aux.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 680adb2..863f3da 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -309,7 +309,7 @@ prepare_lvmdbusd() { # FIXME: This is not correct! Daemon is auto started. echo "checking lvmdbusd is NOT running..." - if ps -elf | grep lvmdbusd | grep python3; then + if pgrep lvmdbusd | grep python3; then echo "Cannot run while existing lvmdbusd process exists" return 1 fi @@ -343,7 +343,7 @@ prepare_lvmdbusd() { sleep 1 echo "checking lvmdbusd IS running..." - if ! ps -elf | grep lvmdbusd | grep python3; then + if ! pgrep lvmdbusd | grep python3; then echo "Failed to start lvmdbusd daemon" return 1 fi

1 0

master - tests: aux.sh double quote
by Zdenek Kabelac 29 Jun '17

29 Jun '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=72a58ce4b0f68f6e45ae3… Commit: 72a58ce4b0f68f6e45ae30606fe5af21caa42b43 Parent: 191dadc623e6fe07c380744c5a88b29d0f868a30 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 29 00:02:19 2017 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 29 22:23:16 2017 +0200 tests: aux.sh double quote --- test/lib/aux.sh | 132 +++++++++++++++++++++++++++--------------------------- 1 files changed, 66 insertions(+), 66 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 6217c4c..680adb2 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -217,7 +217,7 @@ prepare_lvmetad() { local run_valgrind= test "${LVM_VALGRIND_LVMETAD:-0}" -eq 0 || run_valgrind="run_valgrind" - kill_sleep_kill_ LOCAL_LVMETAD ${LVM_VALGRIND_LVMETAD:-0} + kill_sleep_kill_ LOCAL_LVMETAD "${LVM_VALGRIND_LVMETAD:-0}" # Avoid reconfiguring, if already set to use_lvmetad (grep use_lvmetad CONFIG_VALUES 2>/dev/null | tail -n 1 | grep -q 1) || \ @@ -226,7 +226,7 @@ prepare_lvmetad() { # by setting LVM_TEST_LVMETAD_DEBUG_OPTS before calling inittest. echo "preparing lvmetad..." $run_valgrind lvmetad -f "$@" -s "$TESTDIR/lvmetad.socket" \ - ${LVM_TEST_LVMETAD_DEBUG_OPTS--l all} "$@" & + "${LVM_TEST_LVMETAD_DEBUG_OPTS--l all}" "$@" & echo $! > LOCAL_LVMETAD while ! test -e "$TESTDIR/lvmetad.socket"; do echo -n .; sleep .1; done # wait for the socket echo ok @@ -256,7 +256,7 @@ lvmetad_dump() { notify_lvmetad() { if test -e LOCAL_LVMETAD; then # Ignore results here... - LVM_LOG_FILE_EPOCH= pvscan --cache "$@" || true + LVM_LOG_FILE_EPOCH="" pvscan --cache "$@" || true rm -f debug.log fi } @@ -271,7 +271,7 @@ prepare_lvmpolld() { local run_valgrind= test "${LVM_VALGRIND_LVMPOLLD:-0}" -eq 0 || run_valgrind="run_valgrind" - kill_sleep_kill_ LOCAL_LVMPOLLD ${LVM_VALGRIND_LVMPOLLD:-0} + kill_sleep_kill_ LOCAL_LVMPOLLD "${LVM_VALGRIND_LVMPOLLD:-0}" echo "preparing lvmpolld..." $run_valgrind lvmpolld -f "$@" -s "$TESTDIR/lvmpolld.socket" -B "$TESTDIR/lib/lvm" -l all & @@ -332,7 +332,7 @@ prepare_lvmdbusd() { # Copy the needed file to run on the system bus if it doesn't # already exist if [ ! -f /etc/dbus-1/system.d/com.redhat.lvmdbus1.conf ]; then - install -m 644 $abs_top_builddir/scripts/com.redhat.lvmdbus1.conf /etc/dbus-1/system.d/ + install -m 644 "$abs_top_builddir/scripts/com.redhat.lvmdbus1.conf" /etc/dbus-1/system.d/ fi echo "preparing lvmdbusd..." @@ -369,10 +369,10 @@ prepare_thin_metadata() { local nr_data_blocks=${4:-3200} local i - echo '<superblock uuid="" time="1" transaction="'$transaction_id'" data_block_size="'$data_block_size'" nr_data_blocks="'$nr_data_blocks'">' - for i in $(seq 1 $devices) + echo '<superblock uuid="" time="1" transaction="'"$transaction_id"'" data_block_size="'"$data_block_size"'" nr_data_blocks="'"$nr_data_blocks"'">' + for i in $(seq 1 "$devices") do - echo ' <device dev_id="'$i'" mapped_blocks="37" transaction="'$i'" creation_time="0" snap_time="1">' + echo ' <device dev_id="'"$i"'" mapped_blocks="37" transaction="'"$i"'" creation_time="0" snap_time="1">' echo ' <range_mapping origin_begin="0" data_begin="0" length="37" time="0"/>' echo ' </device>' done @@ -418,13 +418,13 @@ teardown_devs_prefixed() { done wait finish_udev_transaction - test $need_udev_wait -eq 0 || udev_wait + test "$need_udev_wait" -eq 0 || udev_wait if test -f REMOVE_FAILED; then local num_devs local num_remaining_devs=999 while num_devs=$(dm_table | grep "$prefix" | wc -l) && \ - test $num_devs -lt $num_remaining_devs -a $num_devs -ne 0; do + test "$num_devs" -lt "$num_remaining_devs" -a "$num_devs" -ne 0; do test "$stray" -eq 0 || echo "Removing $num_devs stray mapped devices with names beginning with $prefix: " # HACK: sort also by minors - so we try to close 'possibly later' created device first for dm in $(dm_info name --sort open,-minor | grep "$prefix") ; do @@ -449,8 +449,8 @@ teardown_devs() { if test -f SCSI_DEBUG_DEV; then test "${LVM_TEST_PARALLEL:-0}" -eq 1 || modprobe -r scsi_debug else - test ! -f LOOP || losetup -d $(< LOOP) || true - test ! -f LOOPFILE || rm -f $(< LOOPFILE) + test ! -f LOOP || losetup -d "$(< LOOP)" || true + test ! -f LOOPFILE || rm -f "$(< LOOPFILE)" fi not diff LOOP BACKING_DEV >/dev/null 2>&1 || rm -f BACKING_DEV @@ -462,7 +462,7 @@ teardown_devs() { test ${#stray_loops[@]} -eq 0 || { teardown_devs_prefixed "$COMMON_PREFIX" 1 echo "Removing stray loop devices containing $COMMON_PREFIX: ${stray_loops[@]}" - for i in "${stray_loops[@]}" ; do test ! -b $i || losetup -d $i || true ; done + for i in "${stray_loops[@]}" ; do test ! -b "$i" || losetup -d "$i" || true ; done # Leave test when udev processed all removed devices udev_wait } @@ -472,14 +472,14 @@ teardown_devs() { kill_sleep_kill_() { pidfile=$1 slow=$2 - if test -s $pidfile ; then - pid=$(< $pidfile) - rm -f $pidfile - kill -TERM $pid 2>/dev/null || return 0 - if test $slow -eq 0 ; then sleep .1 ; else sleep 1 ; fi - kill -KILL $pid 2>/dev/null || true + if test -s "$pidfile" ; then + pid=$(< "$pidfile") + rm -f "$pidfile" + kill -TERM "$pid" 2>/dev/null || return 0 + if test "$slow" -eq 0 ; then sleep .1 ; else sleep 1 ; fi + kill -KILL "$pid" 2>/dev/null || true wait=0 - while ps $pid > /dev/null && test $wait -le 10; do + while ps "$pid" > /dev/null && test "$wait" -le 10; do sleep .5 wait=$(($wait + 1)) done @@ -503,7 +503,7 @@ kill_tagged_processes() { print_procs_by_tag_ "$@" | while read -r pid wait; do if test -n "$pid" ; then echo "Killing tagged process: $pid ${wait:0:120}..." - kill -TERM $pid 2>/dev/null || true + kill -TERM "$pid" 2>/dev/null || true fi pids="$pids $pid" done @@ -511,11 +511,11 @@ kill_tagged_processes() { # wait if process exited and eventually -KILL wait=0 for pid in $pids ; do - while ps $pid > /dev/null && test $wait -le 10; do + while ps "$pid" > /dev/null && test "$wait" -le 10; do sleep .2 wait=$(($wait + 1)) done - test $wait -le 10 || kill -KILL $pid 2>/dev/null || true + test "$wait" -le 10 || kill -KILL "$pid" 2>/dev/null || true done } @@ -542,7 +542,7 @@ teardown() { killall -9 lvmlockd || true fi - kill_sleep_kill_ LOCAL_LVMETAD ${LVM_VALGRIND_LVMETAD:-0} + kill_sleep_kill_ LOCAL_LVMETAD "${LVM_VALGRIND_LVMETAD:-0}" dm_table | not egrep -q "$vg|$vg1|$vg2|$vg3|$vg4" || { # Avoid activation of dmeventd if there is no pid @@ -550,8 +550,8 @@ teardown() { if echo "$(dm_info suspended,name)" | grep -q "^Suspended:.*$prefix" ; then echo "Skipping vgremove, suspended devices detected." else - vgremove -ff $cfg \ - $vg $vg1 $vg2 $vg3 $vg4 &>/dev/null || rm -f debug.log strace.log + vgremove -ff "$cfg" \ + "$vg" "$vg1" "$vg2" "$vg3" "$vg4" &>/dev/null || rm -f debug.log strace.log fi } @@ -559,15 +559,15 @@ teardown() { echo -n . - kill_sleep_kill_ LOCAL_LVMPOLLD ${LVM_VALGRIND_LVMPOLLD:-0} + kill_sleep_kill_ LOCAL_LVMPOLLD "${LVM_VALGRIND_LVMPOLLD:-0}" echo -n . - kill_sleep_kill_ LOCAL_CLVMD ${LVM_VALGRIND_CLVMD:-0} + kill_sleep_kill_ LOCAL_CLVMD "${LVM_VALGRIND_CLVMD:-0}" echo -n . - kill_sleep_kill_ LOCAL_DMEVENTD ${LVM_VALGRIND_DMEVENTD:-0} + kill_sleep_kill_ LOCAL_DMEVENTD "${LVM_VALGRIND_DMEVENTD:-0}" echo -n . @@ -668,7 +668,7 @@ prepare_scsi_debug_dev() { # NOTE: it will _never_ make sense to pass num_tgts param; # last param wins.. so num_tgts=1 is imposed touch SCSI_DEBUG_DEV - modprobe scsi_debug dev_size_mb=$DEV_SIZE $SCSI_DEBUG_PARAMS num_tgts=1 || skip + modprobe scsi_debug dev_size_mb="$DEV_SIZE" $SCSI_DEBUG_PARAMS num_tgts=1 || skip for i in {1..20} ; do DEBUG_DEV="/dev/$(grep -H scsi_debug /sys/block/*/device/model | cut -f4 -d /)" @@ -678,7 +678,7 @@ prepare_scsi_debug_dev() { test -b "$DEBUG_DEV" || return 1 # should not happen # Create symlink to scsi_debug device in $DM_DEV_DIR - SCSI_DEBUG_DEV="$DM_DEV_DIR/$(basename $DEBUG_DEV)" + SCSI_DEBUG_DEV="$DM_DEV_DIR/$(basename "$DEBUG_DEV")" echo "$SCSI_DEBUG_DEV" > SCSI_DEBUG_DEV echo "$SCSI_DEBUG_DEV" > BACKING_DEV # Setting $LOOP provides means for prepare_devs() override @@ -713,7 +713,7 @@ prepare_md_dev() { mddev=/dev/md/md_lvm_test0 || \ mddev=/dev/md_lvm_test0 - mdadm --create --metadata=1.0 "$mddev" --auto=md --level $level --bitmap=internal $coption=$rchunk --raid-devices=$rdevs "${@:4}" || { + mdadm --create --metadata=1.0 "$mddev" --auto=md --level "$level" --bitmap=internal "$coption"="$rchunk" --raid-devices="$rdevs" "${@:4}" || { # Some older 'mdadm' version managed to open and close devices internaly # and reporting non-exclusive access on such device # let's just skip the test if this happens. @@ -735,7 +735,7 @@ prepare_md_dev() { echo "$DM_DEV_DIR/md_lvm_test0" ;; esac > MD_DEV_PV echo "$mddev" > MD_DEV - notify_lvmetad $(< MD_DEV_PV) + notify_lvmetad "$(< MD_DEV_PV)" printf "%s\n" "${@:4}" > MD_DEVICES for mddev in "${@:4}"; do notify_lvmetad "$mddev" @@ -750,8 +750,8 @@ cleanup_md_dev() { udev_wait mdadm --stop "$dev" || true - test "$DM_DEV_DIR" != "/dev" && rm -f "$DM_DEV_DIR/$(basename $dev)" - notify_lvmetad $(< MD_DEV_PV) + test "$DM_DEV_DIR" != "/dev" && rm -f "$DM_DEV_DIR/$(basename "$dev")" + notify_lvmetad "$(< MD_DEV_PV)" udev_wait # wait till events are process, not zeroing to early for dev in $(< MD_DEVICES); do mdadm --zero-superblock "$dev" || true @@ -801,7 +801,7 @@ prepare_devs() { local count=0 rm -f CREATE_FAILED init_udev_transaction - for i in $(seq 1 $n); do + for i in $(seq 1 "$n"); do local name="${PREFIX}$pvname$i" local dev="$DM_DEV_DIR/mapper/$name" DEVICES[$count]=$dev @@ -821,7 +821,7 @@ prepare_devs() { fi # non-ephemeral devices need to be cleared between tests - test -f LOOP || for d in ${DEVICES[@]}; do + test -f LOOP || for d in "${DEVICES[@]}"; do blkdiscard "$d" 2>/dev/null || true # ensure disk header is always zeroed dd if=/dev/zero of="$d" bs=32k count=1 @@ -878,7 +878,7 @@ common_dev_() { read pos size type pvdev offset < "$name.table" - for fromlen in ${offsets[@]}; do + for fromlen in "${offsets[@]}"; do from=${fromlen%%:*} len=${fromlen##*:} test -n "$len" || len=$(($size - $from)) @@ -955,8 +955,8 @@ disable_dev() { done test -n "$silent" || for num in $notify; do - notify_lvmetad --major $(echo $num | sed -e "s,:.*,,") \ - --minor $(echo $num | sed -e "s,.*:,,") + notify_lvmetad --major "$(echo "$num" | sed -e "s,:.*,,")" \ + --minor "$(echo "$num" | sed -e "s,.*:,,")" done } @@ -1057,13 +1057,13 @@ prepare_vg() { teardown_devs prepare_devs "$@" - vgcreate -s 512K $vg "${DEVICES[@]}" + vgcreate -s 512K "$vg" "${DEVICES[@]}" } extend_filter() { filter=$(grep ^devices/global_filter CONFIG_VALUES | tail -n 1) for rx in "$@"; do - filter=$(echo $filter | sed -e "s:\[:[ \"$rx\", :") + filter=$(echo "$filter" | sed -e "s:\[:[ \"$rx\", :") done lvmconf "$filter" } @@ -1074,16 +1074,16 @@ extend_filter_LVMTEST() { hide_dev() { filter=$(grep ^devices/global_filter CONFIG_VALUES | tail -n 1) - for dev in $@; do - filter=$(echo $filter | sed -e "s:\[:[ \"r|$dev|\", :") + for dev in "$@"; do + filter=$(echo "$filter" | sed -e "s:\[:[ \"r|$dev|\", :") done lvmconf "$filter" } unhide_dev() { filter=$(grep ^devices/global_filter CONFIG_VALUES | tail -n 1) - for dev in $@; do - filter=$(echo $filter | sed -e "s:\"r|$dev|\", ::") + for dev in "$@"; do + filter=$(echo "$filter" | sed -e "s:\"r|$dev|\", ::") done lvmconf "$filter" } @@ -1096,9 +1096,9 @@ mkdev_md5sum() { generate_config() { if test -n "$profile_name"; then - config_values=PROFILE_VALUES_$profile_name - config=PROFILE_$profile_name - touch $config_values + config_values="PROFILE_VALUES_$profile_name" + config="PROFILE_$profile_name" + touch "$config_values" else config_values=CONFIG_VALUES config=CONFIG @@ -1201,11 +1201,11 @@ EOF # read sequential list and put into associative array while IFS=$IFS_NL read -r v; do # trim white-space-chars via echo when inserting - CONF[$(echo ${v%%[={]*})]=${v#*/} + CONF["$(echo ${v%%[={]*})"]=${v#*/} done < "$config_values" # sort by section and iterate through them - printf "%s\n" ${!CONF[@]} | sort | while read -r v ; do + printf "%s\n" "${!CONF[@]}" | sort | while read -r v ; do sec=${v%%/*} # split on section'/'param_name test "$sec" = "$last_sec" || { test -z "$last_sec" || echo "}" @@ -1230,14 +1230,14 @@ profileconf() { profile_name="$1" shift generate_config "$@" - mkdir -p $pdir + mkdir -p "$pdir" mv -f "PROFILE_$profile_name" "$pdir/$profile_name.profile" } prepare_profiles() { local pdir="$LVM_SYSTEM_DIR/profile" - mkdir -p $pdir - for profile_name in $@; do + mkdir -p "$pdir" + for profile_name in "$@"; do test -L "lib/$profile_name.profile" || skip cp "lib/$profile_name.profile" "$pdir/$profile_name.profile" done @@ -1328,7 +1328,7 @@ udev_wait() { wait_for_sync() { local i for i in {1..100} ; do - check in_sync $1 $2 $3 && return + check in_sync "$1" "$2" "$3" && return sleep .2 done @@ -1492,7 +1492,7 @@ have_readline() { have_multi_core() { which nproc &>/dev/null || return 0 - [ $(nproc) -ne 1 ] + [ "$(nproc)" -ne 1 ] } dmsetup_wrapped() { @@ -1515,8 +1515,8 @@ awk_parse_init_count_in_lvmpolld_dump() { } check_lvmpolld_init_rq_count() { - local ret=$(awk -v vvalue="$2" -v vkey=${3:-lvname} "$(awk_parse_init_count_in_lvmpolld_dump)" lvmpolld_dump.txt) - test $ret -eq $1 || { + local ret=$(awk -v vvalue="$2" -v vkey="${3:-lvname}" "$(awk_parse_init_count_in_lvmpolld_dump)" lvmpolld_dump.txt) + test "$ret" -eq "$1" || { echo "check_lvmpolld_init_rq_count failed. Expected $1, got $ret" return 1 } @@ -1529,23 +1529,23 @@ wait_pvmove_lv_ready() { if [ -e LOCAL_LVMPOLLD ]; then local lvid while : ; do - test $retries -le 0 && die "Waiting for lvmpolld timed out" + test "$retries" -le 0 && die "Waiting for lvmpolld timed out" test -n "$lvid" || { - lvid=$(get lv_field ${1//-/\/} vg_uuid,lv_uuid -a 2>/dev/null) + lvid=$(get lv_field "${1//-/\/}" vg_uuid,lv_uuid -a 2>/dev/null) lvid=${lvid//\ /} lvid=${lvid//-/} } test -z "$lvid" || { lvmpolld_dump > lvmpolld_dump.txt - ! check_lvmpolld_init_rq_count 1 $lvid lvid || break; + ! check_lvmpolld_init_rq_count 1 "$lvid" lvid || break; } sleep .1 retries=$((retries-1)) done else while : ; do - test $retries -le 0 && die "Waiting for pvmove LV to get activated has timed out" - dmsetup info -c -o tables_loaded $1 > out 2>/dev/null|| true; + test "$retries" -le 0 && die "Waiting for pvmove LV to get activated has timed out" + dmsetup info -c -o tables_loaded "$1" >out 2>/dev/null|| true; not grep Live out >/dev/null || break sleep .1 retries=$((retries-1)) @@ -1560,11 +1560,11 @@ hold_device_open() { local lvname=$2 local sec=${3:-20} # default 20sec - sleep $sec < "$DM_DEV_DIR/$vgname/$lvname" >/dev/null 2>&1 & + sleep "$sec" < "$DM_DEV_DIR/$vgname/$lvname" >/dev/null 2>&1 & SLEEP_PID=$! # wait till device is openned for i in $(seq 1 50) ; do - if test "$(dmsetup info --noheadings -c -o open $vgname-$lvname)" -ne 0 ; then + if test "$(dmsetup info --noheadings -c -o open "$vgname"-"$lvname")" -ne 0 ; then echo "$SLEEP_PID" return fi @@ -1577,7 +1577,7 @@ hold_device_open() { # return total memory size in kB units total_mem() { while IFS=":" read -r a b ; do - case "$a" in MemTotal*) echo ${b%% kB} ; break ;; esac + case "$a" in MemTotal*) echo "${b%% kB}" ; break ;; esac done < /proc/meminfo }

1 0

master - clvmd_fix_conf.sh: double quote
by Zdenek Kabelac 29 Jun '17

29 Jun '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=191dadc623e6fe07c3807… Commit: 191dadc623e6fe07c380744c5a88b29d0f868a30 Parent: 99925d0d416dd7664af0fc507480499f44a7915e Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 29 22:07:49 2017 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 29 22:23:16 2017 +0200 clvmd_fix_conf.sh: double quote --- scripts/clvmd_fix_conf.sh | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/scripts/clvmd_fix_conf.sh b/scripts/clvmd_fix_conf.sh index 079cf30..5716d06 100644 --- a/scripts/clvmd_fix_conf.sh +++ b/scripts/clvmd_fix_conf.sh @@ -63,21 +63,20 @@ have_dir=1 have_library=1 have_global=1 -grep -q '^[[:blank:]]*locking_type[[:blank:]]*=' $LVMCONF +grep -q '^[[:blank:]]*locking_type[[:blank:]]*=' "$LVMCONF" have_type=$? -grep -q '^[[:blank:]]*library_dir[[:blank:]]*=' $LVMCONF +grep -q '^[[:blank:]]*library_dir[[:blank:]]*=' "$LVMCONF" have_dir=$? -grep -q '^[[:blank:]]*locking_library[[:blank:]]*=' $LVMCONF +grep -q '^[[:blank:]]*locking_library[[:blank:]]*=' "$LVMCONF" have_library=$? # Those options are in section "global {" so we must have one if any are present. -if [ "$have_type" = "0" -o "$have_dir" = "0" -o "$have_library" = "0" ] -then +if [ "$have_type" = 0 ] || [ "$have_dir" = 0 ] || [ "$have_library" = 0 ] ; then # See if we can find it... - grep -q '^[[:blank:]]*global[[:blank:]]*{' $LVMCONF + grep -q '^[[:blank:]]*global[[:blank:]]*{' "$LVMCONF" have_global=$? if [ "$have_global" = "1" ] @@ -92,7 +91,7 @@ fi if [ "$have_global" = "1" ] then - cat $LVMCONF - <<EOF > $TMPFILE + cat "$LVMCONF" - <<EOF > "$TMPFILE" global { # Enable locking for cluster LVM locking_type = $locking_type @@ -132,8 +131,8 @@ else SEDCMD="${SEDCMD}\n/global[[:blank:]]*{/a\ \ \ \ locking_library = \"$LIB\"" fi - echo -e $SEDCMD > $SCRIPTFILE - sed <$LVMCONF >$TMPFILE -f $SCRIPTFILE + echo -e "$SEDCMD" > "$SCRIPTFILE" + sed <"$LVMCONF" >"$TMPFILE" -f "$SCRIPTFILE" if [ $? != 0 ] then echo "sed failed, $LVMCONF not updated" @@ -144,19 +143,19 @@ fi # Now we have a suitably editted config file in a temp place, # backup the original and copy our new one into place. -cp $LVMCONF $LVMCONF.nocluster +cp "$LVMCONF" "$LVMCONF.nocluster" if [ $? != 0 ] then echo "failed to backup old config file, $LVMCONF not updated" exit 2 fi -cp $TMPFILE $LVMCONF +cp "$TMPFILE" "$LVMCONF" if [ $? != 0 ] then echo "failed to copy new config file into place, check $LVMCONF is still OK" exit 3 fi -rm -f $SCRIPTFILE $TMPFILE +rm -f "$SCRIPTFILE" "$TMPFILE"

1 0

master - clvmd_fix_conf.sh: legacy code
by Zdenek Kabelac 29 Jun '17

29 Jun '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=99925d0d416dd7664af0f… Commit: 99925d0d416dd7664af0fc507480499f44a7915e Parent: afa0bd916e9b54530ad2eb99373c836c5396ea4f Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 29 22:03:00 2017 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 29 22:23:16 2017 +0200 clvmd_fix_conf.sh: legacy code Use $(..) instead of legacy `..`. --- scripts/clvmd_fix_conf.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/clvmd_fix_conf.sh b/scripts/clvmd_fix_conf.sh index cc2c50d..079cf30 100644 --- a/scripts/clvmd_fix_conf.sh +++ b/scripts/clvmd_fix_conf.sh @@ -52,8 +52,8 @@ then fi -SCRIPTFILE=`mktemp -t lvmscript.XXXXXXXXXX` -TMPFILE=`mktemp -t lvmtmp.XXXXXXXXXX` +SCRIPTFILE=$(mktemp -t lvmscript.XXXXXXXXXX) +TMPFILE=$(mktemp -t lvmtmp.XXXXXXXXXX) # Flags so we know which parts of the file we can replace and which need

1 0

master - vgimportclone.sh: do not quote regex
by Zdenek Kabelac 29 Jun '17

29 Jun '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=afa0bd916e9b54530ad2e… Commit: afa0bd916e9b54530ad2eb99373c836c5396ea4f Parent: ef4506069a1a29cd00532e36c24df9a01cd32600 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 29 18:54:26 2017 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 29 22:23:16 2017 +0200 vgimportclone.sh: do not quote regex Don't quote rhs of =~, it'll match literally rather than as a regex. --- scripts/vgimportclone.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/vgimportclone.sh b/scripts/vgimportclone.sh index 7d3118f..783857e 100755 --- a/scripts/vgimportclone.sh +++ b/scripts/vgimportclone.sh @@ -48,7 +48,7 @@ function getvgname { NAME="${BNAME}" I=0 - while [[ "${VGLIST}" =~ ":${NAME}:" ]] + while [[ "${VGLIST}" =~ :${NAME}: ]] do I=$(( I + 1 )) NAME="${BNAME}$I"

1 0

← Newer
1
2
3
4
5
6
7
...
21
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits June 2017