From 56c8b9269a9bd9c7bb4fbfdd85088ae11c2f1a04 Mon Sep 17 00:00:00 2001
From: "nico.vanelslande" <nico.vanelslande@red-gate.com>
Date: Tue, 31 May 2016 14:51:56 +0100
Subject: [PATCH 1/4] Improved resilience of the VirtualBox driver
 read_used_ports function by

ignoring VMs that may have been deleted between the calls to
'vboxmanage list vms' and 'vboxmanage showvminfo'
---
 plugins/providers/virtualbox/driver/version_4_0.rb | 11 +++++++++--
 plugins/providers/virtualbox/driver/version_4_1.rb | 11 +++++++++--
 plugins/providers/virtualbox/driver/version_4_2.rb | 11 +++++++++--
 plugins/providers/virtualbox/driver/version_4_3.rb | 11 +++++++++--
 plugins/providers/virtualbox/driver/version_5_0.rb | 13 ++++++++++---
 5 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/plugins/providers/virtualbox/driver/version_4_0.rb b/plugins/providers/virtualbox/driver/version_4_0.rb
index 66e9a37be..7c37a69b7 100644
--- a/plugins/providers/virtualbox/driver/version_4_0.rb
+++ b/plugins/providers/virtualbox/driver/version_4_0.rb
@@ -422,8 +422,15 @@ module VagrantPlugins
               # Ignore our own used ports
               next if uuid == @uuid
 
-              read_forwarded_ports(uuid, true).each do |_, _, hostport, _|
-                ports << hostport
+              begin
+                read_forwarded_ports(uuid, true).each do |_, _, hostport, _|
+                  ports << hostport
+                end
+              rescue Vagrant::Errors::VBoxManageError => e
+                raise if !e.extra_data[:stderr].include?("VBOX_E_OBJECT_NOT_FOUND")
+
+                # VirtualBox could not find the vm. It may have been deleted
+                # by another process after we called 'vboxmanage list vms'? Ignore this error.
               end
             end
           end
diff --git a/plugins/providers/virtualbox/driver/version_4_1.rb b/plugins/providers/virtualbox/driver/version_4_1.rb
index 79f4174ad..9093dc16a 100644
--- a/plugins/providers/virtualbox/driver/version_4_1.rb
+++ b/plugins/providers/virtualbox/driver/version_4_1.rb
@@ -525,8 +525,15 @@ module VagrantPlugins
               # Ignore our own used ports
               next if uuid == @uuid
 
-              read_forwarded_ports(uuid, true).each do |_, _, hostport, _|
-                ports << hostport
+              begin
+                read_forwarded_ports(uuid, true).each do |_, _, hostport, _|
+                  ports << hostport
+                end
+              rescue Vagrant::Errors::VBoxManageError => e
+                raise if !e.extra_data[:stderr].include?("VBOX_E_OBJECT_NOT_FOUND")
+
+                # VirtualBox could not find the vm. It may have been deleted
+                # by another process after we called 'vboxmanage list vms'? Ignore this error.
               end
             end
           end
diff --git a/plugins/providers/virtualbox/driver/version_4_2.rb b/plugins/providers/virtualbox/driver/version_4_2.rb
index 6ece1d91e..de2c46dad 100644
--- a/plugins/providers/virtualbox/driver/version_4_2.rb
+++ b/plugins/providers/virtualbox/driver/version_4_2.rb
@@ -458,8 +458,15 @@ module VagrantPlugins
               # Ignore our own used ports
               next if uuid == @uuid
 
-              read_forwarded_ports(uuid, true).each do |_, _, hostport, _|
-                ports << hostport
+              begin
+                read_forwarded_ports(uuid, true).each do |_, _, hostport, _|
+                  ports << hostport
+                end
+              rescue Vagrant::Errors::VBoxManageError => e
+                raise if !e.extra_data[:stderr].include?("VBOX_E_OBJECT_NOT_FOUND")
+
+                # VirtualBox could not find the vm. It may have been deleted
+                # by another process after we called 'vboxmanage list vms'? Ignore this error.
               end
             end
           end
diff --git a/plugins/providers/virtualbox/driver/version_4_3.rb b/plugins/providers/virtualbox/driver/version_4_3.rb
index 4f2caccf8..ce125625c 100644
--- a/plugins/providers/virtualbox/driver/version_4_3.rb
+++ b/plugins/providers/virtualbox/driver/version_4_3.rb
@@ -569,8 +569,15 @@ module VagrantPlugins
               # Ignore our own used ports
               next if uuid == @uuid
 
-              read_forwarded_ports(uuid, true).each do |_, _, hostport, _|
-                ports << hostport
+              begin
+                read_forwarded_ports(uuid, true).each do |_, _, hostport, _|
+                  ports << hostport
+                end
+              rescue Vagrant::Errors::VBoxManageError => e
+                raise if !e.extra_data[:stderr].include?("VBOX_E_OBJECT_NOT_FOUND")
+
+                # VirtualBox could not find the vm. It may have been deleted
+                # by another process after we called 'vboxmanage list vms'? Ignore this error.
               end
             end
           end
diff --git a/plugins/providers/virtualbox/driver/version_5_0.rb b/plugins/providers/virtualbox/driver/version_5_0.rb
index 7c5b9f16f..b77a5dc29 100644
--- a/plugins/providers/virtualbox/driver/version_5_0.rb
+++ b/plugins/providers/virtualbox/driver/version_5_0.rb
@@ -567,9 +567,16 @@ module VagrantPlugins
               # Ignore our own used ports
               next if uuid == @uuid
 
-              read_forwarded_ports(uuid, true).each do |_, _, hostport, _, hostip|
-                hostip = '*' if hostip.nil? || hostip.empty?
-                used_ports[hostport].add?(hostip)
+              begin
+                read_forwarded_ports(uuid, true).each do |_, _, hostport, _, hostip|
+                  hostip = '*' if hostip.nil? || hostip.empty?
+                  used_ports[hostport].add?(hostip)
+                end
+              rescue Vagrant::Errors::VBoxManageError => e
+                raise if !e.extra_data[:stderr].include?("VBOX_E_OBJECT_NOT_FOUND")
+
+                # VirtualBox could not find the vm. It may have been deleted
+                # by another process after we called 'vboxmanage list vms'? Ignore this error.
               end
             end
           end

From 9aecd5e1a4c7f12ca3a50edc771daa8aff518eda Mon Sep 17 00:00:00 2001
From: "nico.vanelslande" <nico.vanelslande@red-gate.com>
Date: Tue, 31 May 2016 14:54:25 +0100
Subject: [PATCH 2/4] Improved resilience of the VirtualBox driver
 delete_unused_host_only_networks function by

ignoring VMs that may have been deleted between the calls to
'vboxmanage list vms' and 'vboxmanage showvminfo'
---
 .../providers/virtualbox/driver/version_4_0.rb    | 15 +++++++++++----
 .../providers/virtualbox/driver/version_4_1.rb    | 15 +++++++++++----
 .../providers/virtualbox/driver/version_4_2.rb    | 15 +++++++++++----
 .../providers/virtualbox/driver/version_4_3.rb    | 15 +++++++++++----
 .../providers/virtualbox/driver/version_5_0.rb    | 15 +++++++++++----
 5 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/plugins/providers/virtualbox/driver/version_4_0.rb b/plugins/providers/virtualbox/driver/version_4_0.rb
index 7c37a69b7..43db68f0d 100644
--- a/plugins/providers/virtualbox/driver/version_4_0.rb
+++ b/plugins/providers/virtualbox/driver/version_4_0.rb
@@ -85,11 +85,18 @@ module VagrantPlugins
 
           execute("list", "vms").split("\n").each do |line|
             if vm_name = line[/^".+?"\s+\{(.+?)\}$/, 1]
-              info = execute("showvminfo", vm_name, "--machinereadable", retryable: true)
-              info.split("\n").each do |line|
-                if network_name = line[/^hostonlyadapter\d+="(.+?)"$/, 1]
-                  networks.delete(network_name)
+              begin
+                info = execute("showvminfo", vm_name, "--machinereadable", retryable: true)
+                info.split("\n").each do |line|
+                  if network_name = line[/^hostonlyadapter\d+="(.+?)"$/, 1]
+                    networks.delete(network_name)
+                  end
                 end
+              rescue Vagrant::Errors::VBoxManageError => e
+                raise if !e.extra_data[:stderr].include?("VBOX_E_OBJECT_NOT_FOUND")
+
+                # VirtualBox could not find the vm. It may have been deleted
+                # by another process after we called 'vboxmanage list vms'? Ignore this error.
               end
             end
           end
diff --git a/plugins/providers/virtualbox/driver/version_4_1.rb b/plugins/providers/virtualbox/driver/version_4_1.rb
index 9093dc16a..ac07efd3f 100644
--- a/plugins/providers/virtualbox/driver/version_4_1.rb
+++ b/plugins/providers/virtualbox/driver/version_4_1.rb
@@ -176,11 +176,18 @@ module VagrantPlugins
 
           execute("list", "vms").split("\n").each do |line|
             if vm = line[/^".+?"\s+\{(.+?)\}$/, 1]
-              info = execute("showvminfo", vm, "--machinereadable", retryable: true)
-              info.split("\n").each do |line|
-                if adapter = line[/^hostonlyadapter\d+="(.+?)"$/, 1]
-                  networks.delete(adapter)
+              begin
+                info = execute("showvminfo", vm, "--machinereadable", retryable: true)
+                info.split("\n").each do |line|
+                  if adapter = line[/^hostonlyadapter\d+="(.+?)"$/, 1]
+                    networks.delete(adapter)
+                  end
                 end
+              rescue Vagrant::Errors::VBoxManageError => e
+                raise if !e.extra_data[:stderr].include?("VBOX_E_OBJECT_NOT_FOUND")
+
+                # VirtualBox could not find the vm. It may have been deleted
+                # by another process after we called 'vboxmanage list vms'? Ignore this error.
               end
             end
           end
diff --git a/plugins/providers/virtualbox/driver/version_4_2.rb b/plugins/providers/virtualbox/driver/version_4_2.rb
index de2c46dad..2cae69d43 100644
--- a/plugins/providers/virtualbox/driver/version_4_2.rb
+++ b/plugins/providers/virtualbox/driver/version_4_2.rb
@@ -83,11 +83,18 @@ module VagrantPlugins
 
           execute("list", "vms").split("\n").each do |line|
             if line =~ /^".+?"\s+\{(.+?)\}$/
-              info = execute("showvminfo", $1.to_s, "--machinereadable", retryable: true)
-              info.split("\n").each do |inner_line|
-                if inner_line =~ /^hostonlyadapter\d+="(.+?)"$/
-                  networks.delete($1.to_s)
+              begin
+                info = execute("showvminfo", $1.to_s, "--machinereadable", retryable: true)
+                info.split("\n").each do |inner_line|
+                  if inner_line =~ /^hostonlyadapter\d+="(.+?)"$/
+                    networks.delete($1.to_s)
+                  end
                 end
+              rescue Vagrant::Errors::VBoxManageError => e
+                raise if !e.extra_data[:stderr].include?("VBOX_E_OBJECT_NOT_FOUND")
+
+                # VirtualBox could not find the vm. It may have been deleted
+                # by another process after we called 'vboxmanage list vms'? Ignore this error.
               end
             end
           end
diff --git a/plugins/providers/virtualbox/driver/version_4_3.rb b/plugins/providers/virtualbox/driver/version_4_3.rb
index ce125625c..8a1377055 100644
--- a/plugins/providers/virtualbox/driver/version_4_3.rb
+++ b/plugins/providers/virtualbox/driver/version_4_3.rb
@@ -180,11 +180,18 @@ module VagrantPlugins
 
           execute("list", "vms", retryable: true).split("\n").each do |line|
             if line =~ /^".+?"\s+\{(.+?)\}$/
-              info = execute("showvminfo", $1.to_s, "--machinereadable", retryable: true)
-              info.split("\n").each do |inner_line|
-                if inner_line =~ /^hostonlyadapter\d+="(.+?)"$/
-                  networks.delete($1.to_s)
+              begin
+                info = execute("showvminfo", $1.to_s, "--machinereadable", retryable: true)
+                info.split("\n").each do |inner_line|
+                  if inner_line =~ /^hostonlyadapter\d+="(.+?)"$/
+                    networks.delete($1.to_s)
+                  end
                 end
+              rescue Vagrant::Errors::VBoxManageError => e
+                raise if !e.extra_data[:stderr].include?("VBOX_E_OBJECT_NOT_FOUND")
+
+                # VirtualBox could not find the vm. It may have been deleted
+                # by another process after we called 'vboxmanage list vms'? Ignore this error.
               end
             end
           end
diff --git a/plugins/providers/virtualbox/driver/version_5_0.rb b/plugins/providers/virtualbox/driver/version_5_0.rb
index b77a5dc29..7810307c8 100644
--- a/plugins/providers/virtualbox/driver/version_5_0.rb
+++ b/plugins/providers/virtualbox/driver/version_5_0.rb
@@ -176,11 +176,18 @@ module VagrantPlugins
 
           execute("list", "vms", retryable: true).split("\n").each do |line|
             if line =~ /^".+?"\s+\{(.+?)\}$/
-              info = execute("showvminfo", $1.to_s, "--machinereadable", retryable: true)
-              info.split("\n").each do |inner_line|
-                if inner_line =~ /^hostonlyadapter\d+="(.+?)"$/
-                  networks.delete($1.to_s)
+              begin
+                info = execute("showvminfo", $1.to_s, "--machinereadable", retryable: true)
+                info.split("\n").each do |inner_line|
+                  if inner_line =~ /^hostonlyadapter\d+="(.+?)"$/
+                    networks.delete($1.to_s)
+                  end
                 end
+              rescue Vagrant::Errors::VBoxManageError => e
+                raise if !e.extra_data[:stderr].include?("VBOX_E_OBJECT_NOT_FOUND")
+
+                # VirtualBox could not find the vm. It may have been deleted
+                # by another process after we called 'vboxmanage list vms'? Ignore this error.
               end
             end
           end

From 2e775e81018be99ac5b3ba79d32c7a9422252af1 Mon Sep 17 00:00:00 2001
From: Samuel Clark <sclark@oblong.com>
Date: Tue, 25 Apr 2017 12:30:08 -0700
Subject: [PATCH 3/4] 8468 - make more virtualbox commands retryable

Issue: https://github.com/mitchellh/vagrant/issues/8468

A lot of vboxmanage commands are flakey and frequently cause
bringing multiple machines up at once to fail, especially when
the host system is under heavy load. Most commands are also safe
to retry and just result in a no-op, so we can simply add
'retryable' to a lot of existing calls. For the others we need to
do a little bit of cleanup or reevaluate the parameters before
trying again.
---
 .../virtualbox/driver/version_5_0.rb          | 185 +++++++++++-------
 1 file changed, 115 insertions(+), 70 deletions(-)

diff --git a/plugins/providers/virtualbox/driver/version_5_0.rb b/plugins/providers/virtualbox/driver/version_5_0.rb
index 7810307c8..3e12c4665 100644
--- a/plugins/providers/virtualbox/driver/version_5_0.rb
+++ b/plugins/providers/virtualbox/driver/version_5_0.rb
@@ -17,19 +17,23 @@ module VagrantPlugins
         end
 
         def clear_forwarded_ports
-          args = []
-          read_forwarded_ports(@uuid).each do |nic, name, _, _|
-            args.concat(["--natpf#{nic}", "delete", name])
-          end
+          retryable(on: Vagrant::Errors::VBoxManageError, tries: 3, sleep: 1) do
+            args = []
+            read_forwarded_ports(@uuid).each do |nic, name, _, _|
+              args.concat(["--natpf#{nic}", "delete", name])
+            end
 
-          execute("modifyvm", @uuid, *args) if !args.empty?
+            execute("modifyvm", @uuid, *args) if !args.empty?
+          end
         end
 
         def clear_shared_folders
-          info = execute("showvminfo", @uuid, "--machinereadable", retryable: true)
-          info.split("\n").each do |line|
-            if line =~ /^SharedFolderNameMachineMapping\d+="(.+?)"$/
-              execute("sharedfolder", "remove", @uuid, "--name", $1.to_s)
+          retryable(on: Vagrant::Errors::VBoxManageError, tries: 3, sleep: 1) do
+            info = execute("showvminfo", @uuid, "--machinereadable", retryable: true)
+            info.split("\n").each do |line|
+              if line =~ /^SharedFolderNameMachineMapping\d+="(.+?)"$/
+                execute("sharedfolder", "remove", @uuid, "--name", $1.to_s)
+              end
             end
           end
         end
@@ -41,22 +45,29 @@ module VagrantPlugins
             args += ["--snapshot", snapshot_name, "--options", "link"]
           end
 
-          execute("clonevm", master_id, *args)
+          execute("clonevm", master_id, *args, retryable: true)
           return get_machine_id(machine_name)
         end
 
         def create_dhcp_server(network, options)
-          execute("dhcpserver", "add", "--ifname", network,
-                  "--ip", options[:dhcp_ip],
-                  "--netmask", options[:netmask],
-                  "--lowerip", options[:dhcp_lower],
-                  "--upperip", options[:dhcp_upper],
-                  "--enable")
+          retryable(on: Vagrant::Errors::VBoxManageError, tries: 3, sleep: 1) do
+            begin
+              execute("dhcpserver", "add", "--ifname", network,
+                      "--ip", options[:dhcp_ip],
+                      "--netmask", options[:netmask],
+                      "--lowerip", options[:dhcp_lower],
+                      "--upperip", options[:dhcp_upper],
+                      "--enable")
+            rescue Vagrant::Errors::VBoxManageError => e
+              return if e.extra_data[:stderr] == 'VBoxManage: error: DHCP server already exists'
+              raise
+            end
+          end
         end
 
         def create_host_only_network(options)
           # Create the interface
-          execute("hostonlyif", "create") =~ /^Interface '(.+?)' was successfully created$/
+          execute("hostonlyif", "create", retryable: true) =~ /^Interface '(.+?)' was successfully created$/
           name = $1.to_s
 
           # Get the IP so we can determine v4 vs v6
@@ -66,11 +77,13 @@ module VagrantPlugins
           if ip.ipv4?
             execute("hostonlyif", "ipconfig", name,
                     "--ip", options[:adapter_ip],
-                    "--netmask", options[:netmask])
+                    "--netmask", options[:netmask],
+                    retryable: true)
           elsif ip.ipv6?
             execute("hostonlyif", "ipconfig", name,
                     "--ipv6", options[:adapter_ip],
-                    "--netmasklengthv6", options[:netmask].to_s)
+                    "--netmasklengthv6", options[:netmask].to_s,
+                    retryable: true)
           else
             raise "BUG: Unknown IP type: #{ip.inspect}"
           end
@@ -85,7 +98,26 @@ module VagrantPlugins
         end
 
         def create_snapshot(machine_id, snapshot_name)
-          execute("snapshot", machine_id, "take", snapshot_name)
+          execute("snapshot", machine_id, "take", snapshot_name, retryable: true) do |type, data|
+            if type == :stderr
+              # Append the data so we can see the full view
+              total << data.gsub("\r", "")
+
+              # Break up the lines. We can't get the progress until we see an "OK"
+              lines = total.split("\n")
+
+              # The progress of the import will be in the last line. Do a greedy
+              # regular expression to find what we're looking for.
+              match = /.+(\d{2})%/.match(lines.last)
+              if match
+                current = match[1].to_i
+                if current > last
+                  last = current
+                  yield current if block_given?
+                end
+              end
+            end
+          end
         end
 
         def delete_snapshot(machine_id, snapshot_name)
@@ -95,7 +127,7 @@ module VagrantPlugins
           yield 0 if block_given?
 
           # Snapshot and report the % progress
-          execute("snapshot", machine_id, "delete", snapshot_name) do |type, data|
+          execute("snapshot", machine_id, "delete", snapshot_name, retryable: true) do |type, data|
             if type == :stderr
               # Append the data so we can see the full view
               total << data.gsub("\r", "")
@@ -142,7 +174,7 @@ module VagrantPlugins
           total = ""
           yield 0 if block_given?
 
-          execute("snapshot", machine_id, "restore", snapshot_name) do |type, data|
+          execute("snapshot", machine_id, "restore", snapshot_name, retryable: true) do |type, data|
             if type == :stderr
               # Append the data so we can see the full view
               total << data.gsub("\r", "")
@@ -165,7 +197,7 @@ module VagrantPlugins
         end
 
         def delete
-          execute("unregistervm", @uuid, "--delete")
+          execute("unregistervm", @uuid, "--delete", retryable: true)
         end
 
         def delete_unused_host_only_networks
@@ -199,12 +231,12 @@ module VagrantPlugins
             raw("dhcpserver", "remove", "--ifname", name)
 
             # Delete the actual host only network interface.
-            execute("hostonlyif", "remove", name)
+            execute("hostonlyif", "remove", name, retryable: true)
           end
         end
 
         def discard_saved_state
-          execute("discardstate", @uuid)
+          execute("discardstate", @uuid, retryable: true)
         end
 
         def enable_adapters(adapters)
@@ -237,7 +269,7 @@ module VagrantPlugins
             end
           end
 
-          execute("modifyvm", @uuid, *args)
+          execute("modifyvm", @uuid, *args, retryable: true)
         end
 
         def execute_command(command)
@@ -245,11 +277,20 @@ module VagrantPlugins
         end
 
         def export(path)
-          execute("export", @uuid, "--output", path.to_s)
+          retryable(on: Vagrant::Errors::VBoxManageError, tries: 3, sleep: 1) do
+            begin
+              execute("export", @uuid, "--output", path.to_s)
+            rescue Vagrant::Errors::VBoxManageError => e
+              raise if !e.extra_data[:stderr].include?("VERR_E_FILE_ERROR")
+
+              # If the file already exists we'll throw a custom error
+              raise Vagrant::Errors::VirtualBoxFileExists,
+                stderr: e.extra_data[:stderr]
+            end
+          end
         end
 
         def forward_ports(ports)
-          args = []
           ports.each do |options|
             pf_builder = [options[:name],
               options[:protocol] || "tcp",
@@ -258,11 +299,11 @@ module VagrantPlugins
               options[:guestip] || "",
               options[:guestport]]
 
-            args.concat(["--natpf#{options[:adapter] || 1}",
-                        pf_builder.join(",")])
-          end
+            args = ["--natpf#{options[:adapter] || 1}",
+                        pf_builder.join(",")]
 
-          execute("modifyvm", @uuid, *args) if !args.empty?
+            execute("modifyvm", @uuid, *args, retryable: true)
+          end
         end
 
         def get_machine_id(machine_name)
@@ -273,7 +314,7 @@ module VagrantPlugins
         end
 
         def halt
-          execute("controlvm", @uuid, "poweroff")
+          execute("controlvm", @uuid, "poweroff", retryable: true)
         end
 
         def import(ovf)
@@ -322,7 +363,7 @@ module VagrantPlugins
             end
           end
 
-          execute("import", ovf , *name_params, *disk_params) do |type, data|
+          execute("import", ovf , *name_params, *disk_params, retryable: true) do |type, data|
             if type == :stdout
               # Keep track of the stdout so that we can get the VM name
               output << data
@@ -604,26 +645,30 @@ module VagrantPlugins
 
         def reconfig_host_only(interface)
           execute("hostonlyif", "ipconfig", interface[:name],
-                  "--ipv6", interface[:ipv6])
+                  "--ipv6", interface[:ipv6], retryable: true)
         end
 
         def remove_dhcp_server(network_name)
-          execute("dhcpserver", "remove", "--netname", network_name)
+          execute("dhcpserver", "remove", "--netname", network_name, retryable: true)
         end
 
         def set_mac_address(mac)
-          execute("modifyvm", @uuid, "--macaddress1", mac)
+          execute("modifyvm", @uuid, "--macaddress1", mac, retryable: true)
         end
 
         def set_name(name)
-          execute("modifyvm", @uuid, "--name", name, retryable: true)
-        rescue Vagrant::Errors::VBoxManageError => e
-          raise if !e.extra_data[:stderr].include?("VERR_ALREADY_EXISTS")
+          retryable(on: Vagrant::Errors::VBoxManageError, tries: 3, sleep: 1) do
+            begin
+              execute("modifyvm", @uuid, "--name", name)
+            rescue Vagrant::Errors::VBoxManageError => e
+              raise if !e.extra_data[:stderr].include?("VERR_ALREADY_EXISTS")
 
-          # We got VERR_ALREADY_EXISTS. This means that we're renaming to
-          # a VM name that already exists. Raise a custom error.
-          raise Vagrant::Errors::VirtualBoxNameExists,
-            stderr: e.extra_data[:stderr]
+              # We got VERR_ALREADY_EXISTS. This means that we're renaming to
+              # a VM name that already exists. Raise a custom error.
+              raise Vagrant::Errors::VirtualBoxNameExists,
+                stderr: e.extra_data[:stderr]
+            end
+          end
         end
 
         def share_folders(folders)
@@ -647,10 +692,10 @@ module VagrantPlugins
             args << "--transient" if folder.key?(:transient) && folder[:transient]
 
             # Enable symlinks on the shared folder
-            execute("setextradata", @uuid, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/#{folder[:name]}", "1")
+            execute("setextradata", @uuid, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/#{folder[:name]}", "1", retryable: true)
 
             # Add the shared folder
-            execute("sharedfolder", "add", @uuid, *args)
+            execute("sharedfolder", "add", @uuid, *args, retryable: true)
           end
         end
 
@@ -672,40 +717,40 @@ module VagrantPlugins
 
         def start(mode)
           command = ["startvm", @uuid, "--type", mode.to_s]
-          r = raw(*command)
+          retryable(on: Vagrant::Errors::VBoxManageError, tries: 3, sleep: 1) do
+            r = raw(*command)
 
-          if r.exit_code == 0 || r.stdout =~ /VM ".+?" has been successfully started/
-            # Some systems return an exit code 1 for some reason. For that
-            # we depend on the output.
-            return true
+            if r.exit_code == 0 || r.stdout =~ /VM ".+?" has been successfully started/
+              # Some systems return an exit code 1 for some reason. For that
+              # we depend on the output.
+              return true
+            end
+
+            # If we reached this point then it didn't work out.
+            raise Vagrant::Errors::VBoxManageError,
+              command: command.inspect,
+              stderr: r.stderr
           end
-
-          # If we reached this point then it didn't work out.
-          raise Vagrant::Errors::VBoxManageError,
-            command: command.inspect,
-            stderr: r.stderr
         end
 
         def suspend
-          execute("controlvm", @uuid, "savestate")
+          execute("controlvm", @uuid, "savestate", retryable: true)
         end
 
         def unshare_folders(names)
           names.each do |name|
-            begin
-              execute(
-                "sharedfolder", "remove", @uuid,
-                "--name", name,
-                "--transient")
+            retryable(on: Vagrant::Errors::VBoxManageError, tries: 3, sleep: 1) do
+              begin
+                execute(
+                  "sharedfolder", "remove", @uuid,
+                  "--name", name,
+                  "--transient")
 
-              execute(
-                "setextradata", @uuid,
-                "VBoxInternal2/SharedFoldersEnableSymlinksCreate/#{name}")
-            rescue Vagrant::Errors::VBoxManageError => e
-              if e.extra_data[:stderr].include?("VBOX_E_FILE_ERROR")
-                # The folder doesn't exist. ignore.
-              else
-                raise
+                execute(
+                  "setextradata", @uuid,
+                  "VBoxInternal2/SharedFoldersEnableSymlinksCreate/#{name}")
+              rescue Vagrant::Errors::VBoxManageError => e
+                raise if !e.extra_data[:stderr].include?("VBOX_E_FILE_ERROR")
               end
             end
           end

From 9b872c9e7e9827d7d40eebb7c5cf4ad96d8c69b6 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 6 Sep 2017 11:06:45 -0700
Subject: [PATCH 4/4] Cleanup virtualbox retryable commands

Reverting the changes done in 7d2f7dab977d51a21381577a5345f96c22142711
because they don't work and or update vagrant to invoke running the
vbox cli tool for every single forwarded port instead of forwarding them
all in one command.
---
 .../virtualbox/driver/version_5_0.rb          | 30 ++++---------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/plugins/providers/virtualbox/driver/version_5_0.rb b/plugins/providers/virtualbox/driver/version_5_0.rb
index 3e12c4665..3efb31f38 100644
--- a/plugins/providers/virtualbox/driver/version_5_0.rb
+++ b/plugins/providers/virtualbox/driver/version_5_0.rb
@@ -98,26 +98,7 @@ module VagrantPlugins
         end
 
         def create_snapshot(machine_id, snapshot_name)
-          execute("snapshot", machine_id, "take", snapshot_name, retryable: true) do |type, data|
-            if type == :stderr
-              # Append the data so we can see the full view
-              total << data.gsub("\r", "")
-
-              # Break up the lines. We can't get the progress until we see an "OK"
-              lines = total.split("\n")
-
-              # The progress of the import will be in the last line. Do a greedy
-              # regular expression to find what we're looking for.
-              match = /.+(\d{2})%/.match(lines.last)
-              if match
-                current = match[1].to_i
-                if current > last
-                  last = current
-                  yield current if block_given?
-                end
-              end
-            end
-          end
+          execute("snapshot", machine_id, "take", snapshot_name, retryable: true)
         end
 
         def delete_snapshot(machine_id, snapshot_name)
@@ -291,6 +272,7 @@ module VagrantPlugins
         end
 
         def forward_ports(ports)
+          args = []
           ports.each do |options|
             pf_builder = [options[:name],
               options[:protocol] || "tcp",
@@ -299,11 +281,11 @@ module VagrantPlugins
               options[:guestip] || "",
               options[:guestport]]
 
-            args = ["--natpf#{options[:adapter] || 1}",
-                        pf_builder.join(",")]
-
-            execute("modifyvm", @uuid, *args, retryable: true)
+            args.concat(["--natpf#{options[:adapter] || 1}",
+                        pf_builder.join(",")])
           end
+
+          execute("modifyvm", @uuid, *args, retryable: true) if !args.empty?
         end
 
         def get_machine_id(machine_name)