_create_thin_lv_gluster_vol: retry mounting the lv

Also took the opportunity to move to test_with_retry
instead of using a hand-rolled retry loop.

Closes-Bug: #1524656
Change-Id: I0fff95b434a6572efd2af3ac2ec89b5772459cd5
This commit is contained in:
Csaba Henk 2015-12-10 09:30:01 +01:00
parent 28fc5d375f
commit 21d2009e02
1 changed files with 2 additions and 17 deletions

View File

@ -226,26 +226,11 @@ function _create_thin_lv_gluster_vol {
sudo lvcreate -V $vol_size -T $GLUSTERFS_VG_NAME/$GLUSTERFS_THIN_POOL_NAME -n $vol_name
# Format the LV.
local mkfs_result=0
local i
for i in `seq 100`; do
mkfs_result=0
sudo mkfs.xfs -i size=512 /dev/$GLUSTERFS_VG_NAME/$vol_name || mkfs_result=$?
[ $mkfs_result -eq 0 ] && break
sleep 0.1
done
local mkfs_duration="$((i/10)).$((i%10))"
if [ $mkfs_result -eq 0 ]; then
echo "mkfs.xfs succeeded after retrying for $mkfs_duration"
true
else
echo "giving up on mkfs.xfs after retrying for $mkfs_duration with exit code $mkfs_result"
false
fi
test_with_retry "sudo mkfs.xfs -i size=512 /dev/$GLUSTERFS_VG_NAME/$vol_name" "mkfs.xfs failed"
# Mount the filesystem
mkdir -p $MANILA_STATE_PATH/export/$vol_name
sudo mount /dev/$GLUSTERFS_VG_NAME/$vol_name $MANILA_STATE_PATH/export/$vol_name
test_with_retry "sudo mount /dev/$GLUSTERFS_VG_NAME/$vol_name $MANILA_STATE_PATH/export/$vol_name" "mounting XFS from the LV failed"
# Create a directory that would serve as a brick.
sudo mkdir -p $MANILA_STATE_PATH/export/$vol_name/brick