Refix disk size during live migration with disk over-commit
Currently available disk of targer host is calculated based on
local_gb, not available disk(free_disk_gb). This check can be
negative if the target host has no free disk.
Change-Id: Iec50269ef31dfe090f0cd4db95a37909661bd910
closes-bug: 1744079
(cherry picked from commit e2cc275063
)
This commit is contained in:
parent
57f2c3392b
commit
1c1c373291
|
@ -8764,7 +8764,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
|
|||
instance_ref.vcpu_model = test_vcpu_model.fake_vcpumodel
|
||||
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
|
||||
compute_info = {'disk_available_least': -1000,
|
||||
'local_gb': 100,
|
||||
'free_disk_gb': 50,
|
||||
'cpu_info': 'asdf',
|
||||
}
|
||||
filename = "file"
|
||||
|
@ -8781,7 +8781,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
|
|||
return_value.is_volume_backed = False
|
||||
self.assertThat({"filename": "file",
|
||||
'image_type': 'default',
|
||||
'disk_available_mb': 102400,
|
||||
'disk_available_mb': 51200,
|
||||
"disk_over_commit": True,
|
||||
"block_migration": True,
|
||||
"is_volume_backed": False,
|
||||
|
|
|
@ -6622,7 +6622,7 @@ class LibvirtDriver(driver.ComputeDriver):
|
|||
raise exception.MigrationPreCheckError(reason=msg)
|
||||
|
||||
if disk_over_commit:
|
||||
disk_available_gb = dst_compute_info['local_gb']
|
||||
disk_available_gb = dst_compute_info['free_disk_gb']
|
||||
else:
|
||||
disk_available_gb = dst_compute_info['disk_available_least']
|
||||
disk_available_mb = (
|
||||
|
|
Loading…
Reference in New Issue