'Improve map wait for part_table condition' (#3148)

(cherry picked from commit 9fd7454)
OpenNebula · Mar 29, 2019 · 26d75e2 · 26d75e2
1 parent cc0b77b
commit 26d75e2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/src/vmm_mad/remotes/lib/lxd/mapper/mapper.rb b/src/vmm_mad/remotes/lib/lxd/mapper/mapper.rb
@@ -542,4 +542,10 @@ def get_fstype(device)
         fstype
     end
 
+    # Ensures the update of the partition table
+    def update_partable(dev)
+        cmd = "#{COMMANDS[:mount]} --fake #{dev} /mnt"
+        Command.execute(cmd, false)
+    end
+
 end
diff --git a/src/vmm_mad/remotes/lib/lxd/mapper/qcow2.rb b/src/vmm_mad/remotes/lib/lxd/mapper/qcow2.rb
@@ -42,9 +42,7 @@ def do_map(one_vm, disk, _directory)
             return
         end
 
-        # TODO: improve wait condition
-        sleep 1 # wait for parts to come out
-
+        update_partable(device)
         show_parts(device) unless parts_on?(device)
 
         device

diff --git a/src/vmm_mad/remotes/lib/lxd/mapper/rbd.rb b/src/vmm_mad/remotes/lib/lxd/mapper/rbd.rb
@@ -41,11 +41,8 @@ def do_map(one_vm, disk, _directory)
             return
         end
 
-        # TODO: improve wait condition
-        sleep 1 # wait for partition table
-
         device = out.chomp
-        try_mount(device)
+        update_partable(device)
         device
     end
 
@@ -60,13 +57,4 @@ def do_unmap(device, _one_vm, _disk, _directory)
         nil
     end
 
-    private
-
-    # This function tries to mount mapped devices to force update of partition
-    # tables
-    def try_mount(dev)
-        cmd = "#{COMMANDS[:mount]} --fake #{dev} /mnt"
-        Command.execute(cmd, false)
-    end
-
 end