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

fix: https://github.com/OpenNebula/one/issues/1525

Browse Source
This commit is contained in:
kvaps 2017-11-26 01:21:57 +01:00 committed by Tino Vazquez
parent 114396c6e1
commit ab20ed73cd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tm_mad/shared/monitor
View File

@ -85,7 +85,7 @@ for vm in \$vms; do
for disk in \$disks; do
disk_id="\$(echo "\$disk" | cut -d. -f2)"
disk_size="\$(du -mL "\${vmdir}/\${disk}" | awk '{print \$1}')"
disk_size="\$(du -mL "\${vmdir}/\${disk}" 2>/dev/null | awk '{print \$1}')"
snap_dir="\${vmdir}/\${disk}.snap"
[ -z "\$disk_size" ] && continue
@ -95,7 +95,7 @@ for vm in \$vms; do
snaps="\$(ls "\$snap_dir" 2>/dev/null | grep '^[0-9]$')"
for snap in \$snaps; do
snap_size="\$(du -mL "\${snap_dir}/\${snap}" | awk '{print \$1}')"
snap_size="\$(du -mL "\${snap_dir}/\${snap}" 2>/dev/null | awk '{print \$1}')"
[ -z "\$snap_size" ] && continue
echo -n "SNAPSHOT_SIZE=[ID=\${snap},DISK_ID=\${disk_id},SIZE=\${snap_size}] "
done

4
src/tm_mad/ssh/monitor_ds
View File

@ -30,7 +30,7 @@ for vm in $vms; do
for disk in $disks; do
disk_id="$(echo "$disk" | cut -d. -f2)"
disk_size="$(du -mL "${vmdir}/${disk}" | awk '{print $1}')"
disk_size="$(du -mL "${vmdir}/${disk}" 2>/dev/null | awk '{print $1}')"
snap_dir="${vmdir}/${disk}.snap"
[ -z "$disk_size" ] && continue
@ -40,7 +40,7 @@ for vm in $vms; do
snaps="$(ls "$snap_dir" | grep '^[0-9]$')"
for snap in $snaps; do
snap_size="$(du -mL "${snap_dir}/${snap}" | awk '{print $1}')"
snap_size="$(du -mL "${snap_dir}/${snap}" 2>/dev/null | awk '{print $1}')"
[ -z "$snap_size" ] && continue
echo -n "SNAPSHOT_SIZE=[ID=${snap},DISK_ID=${disk_id},SIZE=${snap_size}] "
done