beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attach disk to next available port to avoid port fragmentation

Browse Source 
This commit ensures that vagrant attaches a new disk to the _next
available_ port, rather than the last one "used". This can occur if a
disk has been removed in a previous run, leaving a port open
This commit is contained in:
Brian Cain 2020-01-21 15:38:47 -08:00
parent c0fb8af1a3
commit 3d4d0be58f
No known key found for this signature in database
GPG Key ID: 9FC4639B2E4510A0
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/providers/virtualbox/cap/configure_disks.rb
View File

@ -19,7 +19,7 @@ module VagrantPlugins
return if !Vagrant::Util::Experimental.feature_enabled?("virtualbox_disk_hdd")
if defined_disks.size > MAX_DISK_NUMER
if defined_disks.size > MAX_DISK_NUMBER
# you can only attach up to 30 disks per controller, INCLUDING the primary disk
raise Vagrant::Errors::VirtualBoxDisksDefinedExceedLimit
end
@ -126,23 +126,30 @@ module VagrantPlugins
# Finds the next available port
#
# SATA Controller-ImageUUID-0-0 (sub out ImageUUID)
# - Controller: SATA Controller
# - Port: 0
# - Device: 0
#
# Note: Virtualbox returns the string above with the port and device info
# disk_info = key.split("-")
# port = disk_info[2]
# device = disk_info[3]
#
# @param [Vagrant::Machine] machine
# @return [Hash] dsk_info - The next available port and device on a given controller
def self.get_next_port(machine)
vm_info = machine.provider.driver.show_vm_info
dsk_info = {device: "0", port: "0"}
port = 0
device = 0
disk_images = vm_info.select { |v| v.include?("ImageUUID") && v.include?("SATA Controller") }
disk_images.each do |key,value|
disk_info = key.split("-")
port = disk_info[2]
device = disk_info[3]
end
used_ports = disk_images.keys.map { |k| k.split('-') }.map {|v| v[2].to_i}
next_available_port = ((0..(MAX_DISK_NUMBER-1)).to_a - used_ports).first
dsk_info[:port] = (port.to_i + 1).to_s
dsk_info[:port] = next_available_port.to_s
if dsk_info[:port] == ""
LOGGER.warn("There are no more available ports to attach disks to for the SATA Controller. Clear up some space to attach new disks.")
end
dsk_info
end