mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-17 02:03:15 +09:00
Bug #2541: Fix contributed by Gareth Bult <gareth@linux.co.uk>. Defaults 0 to monitor probes when error occur to prevent syntax errors
(cherry picked from commit 50a288e50d)
This commit is contained in:
1 parent
df019bba7e
commit
ef19abc4aa
1 file changed
+12
@@ -16,6 +16,10 @@ USED_MB=$(du -sLm $DATASTORE_LOCATION 2>/dev/null | cut -f1)
|
||||
TOTAL_MB=$(df -B1M -P $DATASTORE_LOCATION 2>/dev/null | tail -n 1 | awk '{print $2}')
|
||||
FREE_MB=$(df -B1M -P $DATASTORE_LOCATION 2>/dev/null | tail -n 1 | awk '{print $4}')
|
||||
|
||||
USED_MB=${USED_MB:-"0"}
|
||||
TOTAL_MB=${TOTAL_MB:-"0"}
|
||||
FREE_MB=${FREE_MB:-"0"}
|
||||
|
||||
echo "DS_LOCATION_USED_MB=$USED_MB"
|
||||
echo "DS_LOCATION_TOTAL_MB=$TOTAL_MB"
|
||||
echo "DS_LOCATION_FREE_MB=$FREE_MB"
|
||||
@@ -31,6 +35,10 @@ for ds in $dirs; do
|
||||
TOTAL_MB=$(df -B1M -P $dir 2>/dev/null | tail -n 1 | awk '{print $2}')
|
||||
FREE_MB=$(df -B1M -P $dir 2>/dev/null | tail -n 1 | awk '{print $4}')
|
||||
|
||||
USED_MB=${USED_MB:-"0"}
|
||||
TOTAL_MB=${TOTAL_MB:-"0"}
|
||||
FREE_MB=${FREE_MB:-"0"}
|
||||
|
||||
if [ -n "$LVM_SIZE_CMD" ]; then
|
||||
LVM_SIZE=$($LVM_SIZE_CMD ${LVM_VG_PREFIX}${ds} 2>/dev/null)
|
||||
LVM_STATUS=$?
|
||||
@@ -46,6 +54,10 @@ for ds in $dirs; do
|
||||
LVM_FREE=$(echo $LVM_SIZE | cut -d: -f2 | sed 's/\..*//')
|
||||
LVM_USED=$(( $LVM_TOTAL - $LVM_FREE ))
|
||||
|
||||
LVM_TOTAL=${LVM_TOTAL:-"0"}
|
||||
LVM_FREE=${LVM_FREE:-"0"}
|
||||
LVM_USED=${LVM_USED:-"0"}
|
||||
|
||||
echo " USED_MB = $LVM_USED,"
|
||||
echo " TOTAL_MB = $LVM_TOTAL,"
|
||||
echo " FREE_MB = $LVM_FREE,"
|
||||
|
||||
Reference in new issue
Block a user