Skip to content

Commit 2b4a221

Browse files
idryomovidryomov
authored
Merge pull request ceph#59433 from idryomov/wip-drop-xmlstarlet-variable
qa: drop XMLSTARLET variable, use xmlstarlet directly Reviewed-by: Ramana Raja <[email protected]>
2 parents b0096dd + 4f30960 commit 2b4a221

File tree

9 files changed

+42
-79
lines changed

9 files changed

+42
-79
lines changed

‎qa/standalone/ceph-helpers.sh‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,6 @@ TMPDIR=${TMPDIR:-/tmp}
2525
CEPH_BUILD_VIRTUALENV=${TMPDIR}
2626
TESTDIR=${TESTDIR:-${TMPDIR}}
2727

28-
if type xmlstarlet > /dev/null 2>&1; then
29-
XMLSTARLET=xmlstarlet
30-
elif type xml > /dev/null 2>&1; then
31-
XMLSTARLET=xml
32-
else
33-
echo "Missing xmlstarlet binary!"
34-
exit 1
35-
fi
36-
3728
if [ `uname` = FreeBSD ]; then
3829
SED=gsed
3930
AWK=gawk

‎qa/standalone/crush/crush-classes.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function get_osds_up() {
5252
local objectname=$2
5353

5454
local osds=$(ceph --format xml osd map $poolname $objectname 2>/dev/null | \
55-
$XMLSTARLET sel -t -m "//up/osd" -v . -o ' ')
55+
xmlstarlet sel -t -m "//up/osd" -v . -o ' ')
5656
# get rid of the trailing space
5757
echo $osds
5858
}

‎qa/workunits/rbd/cli_generic.sh‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#!/usr/bin/env bash
22
set -ex
33

4-
. $(dirname $0)/../../standalone/ceph-helpers.sh
5-
64
export RBD_FORCE_ALLOW_V1=1
75

86
# make sure rbd pool is EMPTY.. this is a test script!!
@@ -935,7 +933,7 @@ get_migration_state() {
935933
local image=$1
936934

937935
rbd --format xml status $image |
938-
$XMLSTARLET sel -t -v '//status/migration/state'
936+
xmlstarlet sel -t -v '//status/migration/state'
939937
}
940938

941939
test_migration() {
@@ -1175,14 +1173,14 @@ test_trash_purge_schedule() {
11751173

11761174
for i in `seq 12`; do
11771175
test "$(rbd trash purge schedule status --format xml |
1178-
$XMLSTARLET sel -t -v '//scheduled/item/pool')" = 'rbd' && break
1176+
xmlstarlet sel -t -v '//scheduled/item/pool')" = 'rbd' && break
11791177
sleep 10
11801178
done
11811179
rbd trash purge schedule status
11821180
test "$(rbd trash purge schedule status --format xml |
1183-
$XMLSTARLET sel -t -v '//scheduled/item/pool')" = 'rbd'
1181+
xmlstarlet sel -t -v '//scheduled/item/pool')" = 'rbd'
11841182
test "$(rbd trash purge schedule status -p rbd --format xml |
1185-
$XMLSTARLET sel -t -v '//scheduled/item/pool')" = 'rbd'
1183+
xmlstarlet sel -t -v '//scheduled/item/pool')" = 'rbd'
11861184

11871185
rbd trash purge schedule add 2d 00:17
11881186
rbd trash purge schedule ls | grep 'every 2d starting at 00:17'
@@ -1191,36 +1189,36 @@ test_trash_purge_schedule() {
11911189
rbd trash purge schedule ls -p rbd2 -R | grep 'every 2d starting at 00:17'
11921190
rbd trash purge schedule ls -p rbd2/ns1 -R | grep 'every 2d starting at 00:17'
11931191
test "$(rbd trash purge schedule ls -R -p rbd2/ns1 --format xml |
1194-
$XMLSTARLET sel -t -v '//schedules/schedule/pool')" = "-"
1192+
xmlstarlet sel -t -v '//schedules/schedule/pool')" = "-"
11951193
test "$(rbd trash purge schedule ls -R -p rbd2/ns1 --format xml |
1196-
$XMLSTARLET sel -t -v '//schedules/schedule/namespace')" = "-"
1194+
xmlstarlet sel -t -v '//schedules/schedule/namespace')" = "-"
11971195
test "$(rbd trash purge schedule ls -R -p rbd2/ns1 --format xml |
1198-
$XMLSTARLET sel -t -v '//schedules/schedule/items/item/start_time')" = "00:17:00"
1196+
xmlstarlet sel -t -v '//schedules/schedule/items/item/start_time')" = "00:17:00"
11991197

12001198
for i in `seq 12`; do
12011199
rbd trash purge schedule status --format xml |
1202-
$XMLSTARLET sel -t -v '//scheduled/item/pool' | grep 'rbd2' && break
1200+
xmlstarlet sel -t -v '//scheduled/item/pool' | grep 'rbd2' && break
12031201
sleep 10
12041202
done
12051203
rbd trash purge schedule status
12061204
rbd trash purge schedule status --format xml |
1207-
$XMLSTARLET sel -t -v '//scheduled/item/pool' | grep 'rbd2'
1205+
xmlstarlet sel -t -v '//scheduled/item/pool' | grep 'rbd2'
12081206
echo $(rbd trash purge schedule status --format xml |
1209-
$XMLSTARLET sel -t -v '//scheduled/item/pool') | grep 'rbd rbd2 rbd2'
1207+
xmlstarlet sel -t -v '//scheduled/item/pool') | grep 'rbd rbd2 rbd2'
12101208
test "$(rbd trash purge schedule status -p rbd --format xml |
1211-
$XMLSTARLET sel -t -v '//scheduled/item/pool')" = 'rbd'
1209+
xmlstarlet sel -t -v '//scheduled/item/pool')" = 'rbd'
12121210
test "$(echo $(rbd trash purge schedule status -p rbd2 --format xml |
1213-
$XMLSTARLET sel -t -v '//scheduled/item/pool'))" = 'rbd2 rbd2'
1211+
xmlstarlet sel -t -v '//scheduled/item/pool'))" = 'rbd2 rbd2'
12141212

12151213
test "$(echo $(rbd trash purge schedule ls -R --format xml |
1216-
$XMLSTARLET sel -t -v '//schedules/schedule/items'))" = "2d00:17:00 1d01:30:00"
1214+
xmlstarlet sel -t -v '//schedules/schedule/items'))" = "2d00:17:00 1d01:30:00"
12171215

12181216
rbd trash purge schedule add 1d
12191217
rbd trash purge schedule ls | grep 'every 2d starting at 00:17'
12201218
rbd trash purge schedule ls | grep 'every 1d'
12211219

12221220
rbd trash purge schedule ls -R --format xml |
1223-
$XMLSTARLET sel -t -v '//schedules/schedule/items' | grep '2d00:17'
1221+
xmlstarlet sel -t -v '//schedules/schedule/items' | grep '2d00:17'
12241222

12251223
rbd trash purge schedule rm 1d
12261224
rbd trash purge schedule ls | grep 'every 2d starting at 00:17'
@@ -1362,13 +1360,13 @@ test_mirror_snapshot_schedule() {
13621360

13631361
rbd mirror snapshot schedule status
13641362
test "$(rbd mirror snapshot schedule status --format xml |
1365-
$XMLSTARLET sel -t -v '//scheduled_images/image/image')" = 'rbd2/ns1/test1'
1363+
xmlstarlet sel -t -v '//scheduled_images/image/image')" = 'rbd2/ns1/test1'
13661364
test "$(rbd mirror snapshot schedule status -p rbd2 --format xml |
1367-
$XMLSTARLET sel -t -v '//scheduled_images/image/image')" = 'rbd2/ns1/test1'
1365+
xmlstarlet sel -t -v '//scheduled_images/image/image')" = 'rbd2/ns1/test1'
13681366
test "$(rbd mirror snapshot schedule status -p rbd2/ns1 --format xml |
1369-
$XMLSTARLET sel -t -v '//scheduled_images/image/image')" = 'rbd2/ns1/test1'
1367+
xmlstarlet sel -t -v '//scheduled_images/image/image')" = 'rbd2/ns1/test1'
13701368
test "$(rbd mirror snapshot schedule status -p rbd2/ns1 --image test1 --format xml |
1371-
$XMLSTARLET sel -t -v '//scheduled_images/image/image')" = 'rbd2/ns1/test1'
1369+
xmlstarlet sel -t -v '//scheduled_images/image/image')" = 'rbd2/ns1/test1'
13721370

13731371
rbd mirror image demote rbd2/ns1/test1
13741372
for i in `seq 12`; do

‎qa/workunits/rbd/cli_migration.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#!/usr/bin/env bash
22
set -ex
33

4-
. $(dirname $0)/../../standalone/ceph-helpers.sh
5-
64
TEMPDIR=
75
IMAGE1=image1
86
IMAGE2=image2

‎qa/workunits/rbd/journal.sh‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#!/usr/bin/env bash
22
set -e
33

4-
. $(dirname $0)/../../standalone/ceph-helpers.sh
5-
64
function list_tests()
75
{
86
echo "AVAILABLE TESTS"
@@ -45,7 +43,7 @@ test_rbd_journal()
4543
rbd create --image-feature exclusive-lock --image-feature journaling \
4644
--size 128 ${image}
4745
local journal=$(rbd info ${image} --format=xml 2>/dev/null |
48-
$XMLSTARLET sel -t -v "//image/journal")
46+
xmlstarlet sel -t -v "//image/journal")
4947
test -n "${journal}"
5048
rbd journal info ${journal}
5149
rbd journal info --journal ${journal}
@@ -54,14 +52,14 @@ test_rbd_journal()
5452
rbd feature disable ${image} journaling
5553

5654
rbd info ${image} --format=xml 2>/dev/null |
57-
expect_false $XMLSTARLET sel -t -v "//image/journal"
55+
expect_false xmlstarlet sel -t -v "//image/journal"
5856
expect_false rbd journal info ${journal}
5957
expect_false rbd journal info --image ${image}
6058

6159
rbd feature enable ${image} journaling
6260

6361
local journal1=$(rbd info ${image} --format=xml 2>/dev/null |
64-
$XMLSTARLET sel -t -v "//image/journal")
62+
xmlstarlet sel -t -v "//image/journal")
6563
test "${journal}" = "${journal1}"
6664

6765
rbd journal info ${journal}
@@ -89,7 +87,7 @@ test_rbd_journal()
8987
rbd create --image-feature exclusive-lock --image-feature journaling \
9088
--size 128 ${image1}
9189
journal1=$(rbd info ${image1} --format=xml 2>/dev/null |
92-
$XMLSTARLET sel -t -v "//image/journal")
90+
xmlstarlet sel -t -v "//image/journal")
9391

9492
save_commit_position ${journal1}
9593
rbd journal import --dest ${image1} $TMPDIR/journal.export
@@ -130,7 +128,7 @@ rbd_assert_eq() {
130128
local expected_val=$4
131129

132130
local val=$(rbd --format xml ${cmd} --image ${image} |
133-
$XMLSTARLET sel -t -v "${param}")
131+
xmlstarlet sel -t -v "${param}")
134132
test "${val}" = "${expected_val}"
135133
}
136134

‎qa/workunits/rbd/rbd-ggate.sh‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@ SIZE=64
77
DATA=
88
DEV=
99

10-
if which xmlstarlet > /dev/null 2>&1; then
11-
XMLSTARLET=xmlstarlet
12-
elif which xml > /dev/null 2>&1; then
13-
XMLSTARLET=xml
14-
else
15-
echo "Missing xmlstarlet binary!"
16-
exit 1
17-
fi
18-
1910
if [ `uname -K` -ge 1200078 ] ; then
2011
RBD_GGATE_RESIZE_SUPPORTED=1
2112
fi
@@ -148,16 +139,16 @@ _sudo sync
148139

149140
echo trim test
150141
provisioned=`rbd -p ${POOL} --format xml du ${IMAGE} |
151-
$XMLSTARLET sel -t -m "//stats/images/image/provisioned_size" -v .`
142+
xmlstarlet sel -t -m "//stats/images/image/provisioned_size" -v .`
152143
used=`rbd -p ${POOL} --format xml du ${IMAGE} |
153-
$XMLSTARLET sel -t -m "//stats/images/image/used_size" -v .`
144+
xmlstarlet sel -t -m "//stats/images/image/used_size" -v .`
154145
[ "${used}" -eq "${provisioned}" ]
155146
_sudo newfs -E ${DEV}
156147
_sudo sync
157148
provisioned=`rbd -p ${POOL} --format xml du ${IMAGE} |
158-
$XMLSTARLET sel -t -m "//stats/images/image/provisioned_size" -v .`
149+
xmlstarlet sel -t -m "//stats/images/image/provisioned_size" -v .`
159150
used=`rbd -p ${POOL} --format xml du ${IMAGE} |
160-
$XMLSTARLET sel -t -m "//stats/images/image/used_size" -v .`
151+
xmlstarlet sel -t -m "//stats/images/image/used_size" -v .`
161152
[ "${used}" -lt "${provisioned}" ]
162153

163154
echo resize test

‎qa/workunits/rbd/rbd-nbd.sh‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#!/usr/bin/env bash
22
set -ex
33

4-
. $(dirname $0)/../../standalone/ceph-helpers.sh
5-
64
POOL=rbd
75
ANOTHER_POOL=new_default_pool$$
86
NS=ns
@@ -105,7 +103,7 @@ function get_pid()
105103
local pool=$1
106104
local ns=$2
107105

108-
PID=$(rbd device --device-type nbd --format xml list | $XMLSTARLET sel -t -v \
106+
PID=$(rbd device --device-type nbd --format xml list | xmlstarlet sel -t -v \
109107
"//devices/device[pool='${pool}'][namespace='${ns}'][image='${IMAGE}'][device='${DEV}']/id")
110108
test -n "${PID}" || return 1
111109
ps -p ${PID} -C rbd-nbd
@@ -172,35 +170,35 @@ unmap_device ${DEV} ${PID}
172170
DEV=`_sudo rbd device --device-type nbd --options notrim map ${POOL}/${IMAGE}`
173171
get_pid ${POOL}
174172
provisioned=`rbd -p ${POOL} --format xml du ${IMAGE} |
175-
$XMLSTARLET sel -t -m "//stats/images/image/provisioned_size" -v .`
173+
xmlstarlet sel -t -m "//stats/images/image/provisioned_size" -v .`
176174
used=`rbd -p ${POOL} --format xml du ${IMAGE} |
177-
$XMLSTARLET sel -t -m "//stats/images/image/used_size" -v .`
175+
xmlstarlet sel -t -m "//stats/images/image/used_size" -v .`
178176
[ "${used}" -eq "${provisioned}" ]
179177
# should fail discard as at time of mapping notrim was used
180178
expect_false _sudo blkdiscard ${DEV}
181179
sync
182180
provisioned=`rbd -p ${POOL} --format xml du ${IMAGE} |
183-
$XMLSTARLET sel -t -m "//stats/images/image/provisioned_size" -v .`
181+
xmlstarlet sel -t -m "//stats/images/image/provisioned_size" -v .`
184182
used=`rbd -p ${POOL} --format xml du ${IMAGE} |
185-
$XMLSTARLET sel -t -m "//stats/images/image/used_size" -v .`
183+
xmlstarlet sel -t -m "//stats/images/image/used_size" -v .`
186184
[ "${used}" -eq "${provisioned}" ]
187185
unmap_device ${DEV} ${PID}
188186

189187
# trim test
190188
DEV=`_sudo rbd device --device-type nbd map ${POOL}/${IMAGE}`
191189
get_pid ${POOL}
192190
provisioned=`rbd -p ${POOL} --format xml du ${IMAGE} |
193-
$XMLSTARLET sel -t -m "//stats/images/image/provisioned_size" -v .`
191+
xmlstarlet sel -t -m "//stats/images/image/provisioned_size" -v .`
194192
used=`rbd -p ${POOL} --format xml du ${IMAGE} |
195-
$XMLSTARLET sel -t -m "//stats/images/image/used_size" -v .`
193+
xmlstarlet sel -t -m "//stats/images/image/used_size" -v .`
196194
[ "${used}" -eq "${provisioned}" ]
197195
# should honor discard as at time of mapping trim was considered by default
198196
_sudo blkdiscard ${DEV}
199197
sync
200198
provisioned=`rbd -p ${POOL} --format xml du ${IMAGE} |
201-
$XMLSTARLET sel -t -m "//stats/images/image/provisioned_size" -v .`
199+
xmlstarlet sel -t -m "//stats/images/image/provisioned_size" -v .`
202200
used=`rbd -p ${POOL} --format xml du ${IMAGE} |
203-
$XMLSTARLET sel -t -m "//stats/images/image/used_size" -v .`
201+
xmlstarlet sel -t -m "//stats/images/image/used_size" -v .`
204202
[ "${used}" -lt "${provisioned}" ]
205203
unmap_device ${DEV} ${PID}
206204

‎qa/workunits/rbd/rbd_mirror_helpers.sh‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,6 @@
7272
# ../qa/workunits/rbd/rbd_mirror_helpers.sh cleanup
7373
#
7474

75-
if type xmlstarlet > /dev/null 2>&1; then
76-
XMLSTARLET=xmlstarlet
77-
elif type xml > /dev/null 2>&1; then
78-
XMLSTARLET=xml
79-
else
80-
echo "Missing xmlstarlet binary!"
81-
exit 1
82-
fi
83-
8475
RBD_MIRROR_INSTANCES=${RBD_MIRROR_INSTANCES:-2}
8576

8677
CLUSTER1=cluster1
@@ -894,9 +885,9 @@ test_mirror_pool_status_verbose()
894885
--verbose --format xml)
895886

896887
local last_update state
897-
last_update=$($XMLSTARLET sel -t -v \
888+
last_update=$(xmlstarlet sel -t -v \
898889
"//images/image[name='${image}']/last_update" <<< "$status")
899-
state=$($XMLSTARLET sel -t -v \
890+
state=$(xmlstarlet sel -t -v \
900891
"//images/image[name='${image}']/state" <<< "$status")
901892

902893
echo "${state}" | grep "${state_pattern}" ||
@@ -1337,7 +1328,7 @@ compare_image_snapshots()
13371328

13381329
for snap_name in $(rbd --cluster ${CLUSTER1} --format xml \
13391330
snap list ${pool}/${image} | \
1340-
$XMLSTARLET sel -t -v "//snapshot/name" | \
1331+
xmlstarlet sel -t -v "//snapshot/name" | \
13411332
grep -E -v "^\.rbd-mirror\."); do
13421333
rm -f ${rmt_export} ${loc_export}
13431334
rbd --cluster ${CLUSTER2} export ${pool}/${image}@${snap_name} ${rmt_export}

‎qa/workunits/rbd/test_admin_socket.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ TMPDIR=/tmp/rbd_test_admin_socket$$
55
mkdir $TMPDIR
66
trap "rm -fr $TMPDIR" 0
77

8-
. $(dirname $0)/../../standalone/ceph-helpers.sh
9-
108
function expect_false()
119
{
1210
set -x
@@ -40,12 +38,12 @@ function rbd_get_perfcounter()
4038
local name
4139

4240
name=$(ceph --format xml --admin-daemon $(rbd_watch_asok ${image}) \
43-
perf schema | $XMLSTARLET el -d3 |
41+
perf schema | xmlstarlet el -d3 |
4442
grep "/librbd-.*-${image}/${counter}\$")
4543
test -n "${name}" || return 1
4644

4745
ceph --format xml --admin-daemon $(rbd_watch_asok ${image}) perf dump |
48-
$XMLSTARLET sel -t -m "${name}" -v .
46+
xmlstarlet sel -t -m "${name}" -v .
4947
}
5048

5149
function rbd_check_perfcounter()

0 commit comments

Comments
 (0)