shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

tests: aux fix check_lvmpolld_init_rq_count

Browse Source 
Make check_lvmpolld_init_rq_count() more compatible with older gawk,
where some functionality was not working properly.
Also change 'not not' condition.
This commit is contained in:
Zdenek Kabelac 2021-03-26 00:33:21 +01:00
parent 73710b87fb
commit 0558b223b8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/lib/aux.sh
View File

@ -1743,11 +1743,11 @@ dmsetup_wrapped() {
awk_parse_init_count_in_lvmpolld_dump() { awk_parse_init_count_in_lvmpolld_dump() {
printf '%s' \ printf '%s' \
\ \
$'BEGINFILE { x=0; answ=0; FS="="; key="[[:space:]]*"vkey }' \ $'BEGINFILE { x=0; answ=0 }' \
$'{' \ $'{' \
$'if (/.*{$/) { x++ }' \ $'if (/.*{$/) { x++ }' \
$'else if (/.*}$/) { x-- }' \ $'else if (/.*}$/) { x-- }' \
$'else if ( x == 2 && $1 ~ key) { value=substr($2, 2); value=substr(value, 1, length(value) - 1); }' \ $'else if ( x == 2 && $1 ~ "[[:space:]]*"vkey) { value=substr($2, 2); value=substr(value, 1, length(value) - 1); }' \
$'if ( x == 2 && value == vvalue && $1 ~ /[[:space:]]*init_requests_count/) { answ=$2 }' \ $'if ( x == 2 && value == vvalue && $1 ~ /[[:space:]]*init_requests_count/) { answ=$2 }' \
$'if (answ > 0) { exit 0 }' \ $'if (answ > 0) { exit 0 }' \
$'}' \ $'}' \
@ -1756,7 +1756,7 @@ awk_parse_init_count_in_lvmpolld_dump() {
check_lvmpolld_init_rq_count() { check_lvmpolld_init_rq_count() {
local ret local ret
ret=$(awk -v vvalue="$2" -v vkey="${3:-lvname}" "$(awk_parse_init_count_in_lvmpolld_dump)" lvmpolld_dump.txt) ret=$(awk -v vvalue="$2" -v vkey="${3:-lvname}" -F= "$(awk_parse_init_count_in_lvmpolld_dump)" lvmpolld_dump.txt)
test "$ret" -eq "$1" || { test "$ret" -eq "$1" || {
die "check_lvmpolld_init_rq_count failed. Expected $1, got $ret" die "check_lvmpolld_init_rq_count failed. Expected $1, got $ret"
} }
@ -1779,7 +1779,7 @@ wait_pvmove_lv_ready() {
} }
test -z "$lvid" || { test -z "$lvid" || {
lvmpolld_dump > lvmpolld_dump.txt 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 sleep .1
retries=$((retries-1)) retries=$((retries-1))