From ab20ed73cd5e5b457f0c19598fb67c8e298e4f20 Mon Sep 17 00:00:00 2001 From: kvaps Date: Sun, 26 Nov 2017 01:21:57 +0100 Subject: [PATCH] fix: https://github.com/OpenNebula/one/issues/1525 --- src/tm_mad/shared/monitor | 4 ++-- src/tm_mad/ssh/monitor_ds | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tm_mad/shared/monitor b/src/tm_mad/shared/monitor index 1c6990d278..c93ccb6352 100755 --- a/src/tm_mad/shared/monitor +++ b/src/tm_mad/shared/monitor @@ -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 diff --git a/src/tm_mad/ssh/monitor_ds b/src/tm_mad/ssh/monitor_ds index f01e51328d..dd2f14c66f 100755 --- a/src/tm_mad/ssh/monitor_ds +++ b/src/tm_mad/ssh/monitor_ds @@ -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