shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Bug #2201: No capacity detected when using LVM datastore

Browse Source 
(cherry picked from commit e5b09835eed56477fc7f3ead5b1964c067af18d7)
This commit is contained in:
Jaime Melis 2013-07-23 12:08:36 -04:00
parent a6770e02b1
commit 5e264b74a9
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/datastore_mad/remotes/ceph/monitor
View File

@ -48,8 +48,8 @@ while IFS= read -r -d '' element; do
done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/HOST \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME)
HOST="${XPATH_ELEMENTS[0]}"
POOL_NAME="${XPATH_ELEMENTS[1]}"
HOST="${XPATH_ELEMENTS[0]:-$HOST}"
POOL_NAME="${XPATH_ELEMENTS[1]:-$POOL_NAME}"
# ------------ Compute datastore usage -------------

6
src/datastore_mad/remotes/iscsi/monitor
View File

@ -48,8 +48,8 @@ while IFS= read -r -d '' element; do
done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/HOST \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VG_NAME)
HOST="${XPATH_ELEMENTS[0]}"
VG_NAME="${XPATH_ELEMENTS[1]}"
HOST="${XPATH_ELEMENTS[0]:-$HOST}"
VG_NAME="${XPATH_ELEMENTS[1]-$VG_NAME}"
# ------------ Compute datastore usage -------------
@ -58,7 +58,7 @@ VG_OPTS="--units M -C --noheadings --nosuffix $VG_NAME"
TOTAL_MB=\$(sudo vgdisplay -o vg_size \$VG_OPTS | tr -d ' ')
FREE_MB=\$(sudo vgdisplay -o vg_free \$VG_OPTS | tr -d ' ')
USED_MB=\$(echo "\$TOTAL_MB - \$FREE_MB" | bc -l)
USED_MB=\$(awk "BEGIN {print \$TOTAL_MB - \$FREE_MB}")
echo "USED_MB=\$USED_MB"
echo "TOTAL_MB=\$TOTAL_MB"

6
src/datastore_mad/remotes/lvm/monitor
View File

@ -48,8 +48,8 @@ while IFS= read -r -d '' element; do
done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/HOST \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VG_NAME)
HOST="${XPATH_ELEMENTS[0]}"
VG_NAME="${XPATH_ELEMENTS[1]}"
HOST="${XPATH_ELEMENTS[0]:-$HOST}"
VG_NAME="${XPATH_ELEMENTS[1]-$VG_NAME}"
# ------------ Compute datastore usage -------------
@ -58,7 +58,7 @@ VG_OPTS="--units M -C --noheadings --nosuffix $VG_NAME"
TOTAL_MB=\$(sudo vgdisplay -o vg_size \$VG_OPTS | tr -d ' ')
FREE_MB=\$(sudo vgdisplay -o vg_free \$VG_OPTS | tr -d ' ')
USED_MB=\$(echo "\$TOTAL_MB - \$FREE_MB" | bc -l)
USED_MB=\$(awk "BEGIN {print \$TOTAL_MB - \$FREE_MB}")
echo "USED_MB=\$USED_MB"
echo "TOTAL_MB=\$TOTAL_MB"