From 0d043e4c1c0a580f8bf12ff5dee5500236aaa290 Mon Sep 17 00:00:00 2001 From: Daniel Clavijo Coca Date: Thu, 10 Jan 2019 04:50:46 -0600 Subject: [PATCH] Validate ext4 resize (#2789) --- src/vmm_mad/remotes/lib/lxd/mapper/mapper.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/vmm_mad/remotes/lib/lxd/mapper/mapper.rb b/src/vmm_mad/remotes/lib/lxd/mapper/mapper.rb index 21d31f5320..4d66bb37b1 100644 --- a/src/vmm_mad/remotes/lib/lxd/mapper/mapper.rb +++ b/src/vmm_mad/remotes/lib/lxd/mapper/mapper.rb @@ -163,8 +163,14 @@ class Mapper Command.execute("#{COMMANDS[:xfs_growfs]} -d #{directory}", false) when /ext/ - Command.execute("#{COMMANDS[:e2fsck]} -f -y #{device}", false) - Command.execute("#{COMMANDS[:resize2fs]} #{device}", false) + rc, _o, e = Command.execute("#{COMMANDS[:e2fsck]} -f -y #{device}", false) + + if rc.zero? + Command.execute("#{COMMANDS[:resize2fs]} #{device}", false) + else + OpenNebula.log_error "#{__method__}: failed to resize #{device}\n#{e}" + end + rc = mount_dev(device, directory) else OpenNebula.log_info "Skipped filesystem #{fs_type} resize"