mirror of
https://github.com/ceph/ceph
synced 2024-12-21 02:42:48 +00:00
91231de16d
This commit fixes a regression introduced by
cf294777ea
Fixes: http://tracker.ceph.com/issues/18388
Signed-off-by: Nathan Cutler <ncutler@suse.com>
48 lines
1.1 KiB
Bash
Executable File
48 lines
1.1 KiB
Bash
Executable File
#!/bin/bash -x
|
|
# can't use -e because of background process
|
|
|
|
IMAGE=rbdrw-image
|
|
LOCKID=rbdrw
|
|
RELPATH=$(dirname $0)/../../../src/test/librbd
|
|
RBDRW=$RELPATH/rbdrw.py
|
|
|
|
rbd create $IMAGE --size 10 --image-format 2 --image-shared || exit 1
|
|
|
|
# rbdrw loops doing I/O to $IMAGE after locking with lockid $LOCKID
|
|
python $RBDRW $IMAGE $LOCKID &
|
|
iochild=$!
|
|
|
|
# give client time to lock and start reading/writing
|
|
LOCKS='{}'
|
|
while [ "$LOCKS" == "{}" ]
|
|
do
|
|
LOCKS=$(rbd lock list $IMAGE --format json)
|
|
sleep 1
|
|
done
|
|
|
|
clientaddr=$(rbd lock list $IMAGE | tail -1 | awk '{print $NF;}')
|
|
clientid=$(rbd lock list $IMAGE | tail -1 | awk '{print $1;}')
|
|
echo "clientaddr: $clientaddr"
|
|
echo "clientid: $clientid"
|
|
|
|
ceph osd blacklist add $clientaddr || exit 1
|
|
|
|
wait $iochild
|
|
rbdrw_exitcode=$?
|
|
if [ $rbdrw_exitcode != 108 ]
|
|
then
|
|
echo "wrong exitcode from rbdrw: $rbdrw_exitcode"
|
|
exit 1
|
|
else
|
|
echo "rbdrw stopped with ESHUTDOWN"
|
|
fi
|
|
|
|
set -e
|
|
ceph osd blacklist rm $clientaddr
|
|
rbd lock remove $IMAGE $LOCKID "$clientid"
|
|
# rbdrw will have exited with an existing watch, so, until #3527 is fixed,
|
|
# hang out until the watch expires
|
|
sleep 30
|
|
rbd rm $IMAGE
|
|
echo OK
|