From 683cbcf26e39857cf942a6dcea5d22b5c82b832b Mon Sep 17 00:00:00 2001 From: Daniel Clavijo Coca Date: Wed, 6 Feb 2019 11:07:19 -0600 Subject: [PATCH] F #1684: Fix trymount (#2904) --- src/vmm_mad/remotes/lib/lxd/mapper/rbd.rb | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/vmm_mad/remotes/lib/lxd/mapper/rbd.rb b/src/vmm_mad/remotes/lib/lxd/mapper/rbd.rb index 081008d0a7..5689110cbb 100644 --- a/src/vmm_mad/remotes/lib/lxd/mapper/rbd.rb +++ b/src/vmm_mad/remotes/lib/lxd/mapper/rbd.rb @@ -44,9 +44,9 @@ class RBDMapper < Mapper # TODO: improve wait condition sleep 1 # wait for partition table - # TODO: deprecate workaround for ubuntu 16.04 not - # updating partition tables - try_mount(out.chomp) + device = out.chomp + try_mount(device) + device end def do_unmap(device, _one_vm, _disk, _directory) @@ -64,12 +64,9 @@ class RBDMapper < Mapper # This function tries to mount mapped devices to force update of partition # tables - def try_mount(device) - dev = device - dev += "p1" if parts_on?(device) - + def try_mount(dev) cmd = "#{COMMANDS[:mount]} --fake #{dev} /mnt" - - device + Command.execute(cmd, false) end + end