Merge "libvirt: Report the allocated size of preallocated file based disks" into stable/ocata

3 files changed, 39 insertions, 13 deletions

diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py
index 54329ea7f3..dfeb72fb27 100755
--- a/nova/tests/unit/virt/libvirt/test_driver.py
+++ b/nova/tests/unit/virt/libvirt/test_driver.py
@@ -4025,8 +4025,9 @@ class LibvirtConnTestCase(test.NoDBTestCase):
 
         @mock.patch.object(dmcrypt, 'delete_volume')
         @mock.patch.object(conn._host, 'get_domain', return_value=dom)
-        def detach_encrypted_volumes(block_device_info, mock_get_domain,
-                                     mock_delete_volume):
+        @mock.patch.object(libvirt_driver.disk_api, 'get_allocated_disk_size')
+        def detach_encrypted_volumes(block_device_info, mock_get_alloc_size,
+                                     mock_get_domain, mock_delete_volume):
             conn._detach_encrypted_volumes(instance, block_device_info)
 
             mock_get_domain.assert_called_once_with(instance)
@@ -7689,6 +7690,8 @@ class LibvirtConnTestCase(test.NoDBTestCase):
                                               is_shared_instance_path=False)
         with test.nested(
                 mock.patch.object(os.path, 'getsize', mock_getsize),
+                mock.patch.object(libvirt_driver.disk_api,
+                                  'get_allocated_disk_size', mock_getsize),
                 mock.patch.object(host.Host, 'get_domain', mock_lookup)):
             self.assertFalse(drvr._is_shared_block_storage(
                                     instance, data,
@@ -10149,9 +10152,14 @@ class LibvirtConnTestCase(test.NoDBTestCase):
         fake_libvirt_utils.disk_sizes['/test/disk.local'] = 20 * units.Gi
         fake_libvirt_utils.disk_backing_files['/test/disk.local'] = 'file'
 
-        self.mox.StubOutWithMock(os.path, "getsize")
-        os.path.getsize('/test/disk').AndReturn((10737418240))
-        os.path.getsize('/test/disk.local').AndReturn((3328599655))
+        self.mox.StubOutWithMock(libvirt_driver.disk_api,
+                                 'get_allocated_disk_size')
+        path = '/test/disk'
+        size = 10737418240
+        libvirt_driver.disk_api.get_allocated_disk_size(path).AndReturn((size))
+        path = '/test/disk.local'
+        size = 3328599655
+        libvirt_driver.disk_api.get_allocated_disk_size(path).AndReturn((size))
 
         ret = ("image: /test/disk.local\n"
                "file format: qcow2\n"
@@ -10258,9 +10266,14 @@ class LibvirtConnTestCase(test.NoDBTestCase):
         fake_libvirt_utils.disk_sizes['/test/disk.local'] = 20 * units.Gi
         fake_libvirt_utils.disk_backing_files['/test/disk.local'] = 'file'
 
-        self.mox.StubOutWithMock(os.path, "getsize")
-        os.path.getsize('/test/disk').AndReturn((10737418240))
-        os.path.getsize('/test/disk.local').AndReturn((3328599655))
+        self.mox.StubOutWithMock(libvirt_driver.disk_api,
+                                 'get_allocated_disk_size')
+        path = '/test/disk'
+        size = 10737418240
+        libvirt_driver.disk_api.get_allocated_disk_size(path).AndReturn((size))
+        path = '/test/disk.local'
+        size = 3328599655
+        libvirt_driver.disk_api.get_allocated_disk_size(path).AndReturn((size))
 
         ret = ("image: /test/disk.local\n"
                "file format: qcow2\n"
@@ -10324,8 +10337,11 @@ class LibvirtConnTestCase(test.NoDBTestCase):
 
         fake_libvirt_utils.disk_sizes['/test/disk'] = 10 * units.Gi
 
-        self.mox.StubOutWithMock(os.path, "getsize")
-        os.path.getsize('/test/disk').AndReturn((10737418240))
+        self.mox.StubOutWithMock(libvirt_driver.disk_api,
+                                 "get_allocated_disk_size")
+        path = '/test/disk'
+        size = 10737418240
+        libvirt_driver.disk_api.get_allocated_disk_size(path).AndReturn((size))
 
         self.mox.ReplayAll()
         drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
@@ -10334,8 +10350,8 @@ class LibvirtConnTestCase(test.NoDBTestCase):
         info = jsonutils.loads(info)
         self.assertEqual(1, len(info))
         self.assertEqual(info[0]['type'], 'raw')
-        self.assertEqual(info[0]['path'], '/test/disk')
-        self.assertEqual(info[0]['disk_size'], 10737418240)
+        self.assertEqual(info[0]['path'], path)
+        self.assertEqual(info[0]['disk_size'], size)
         self.assertEqual(info[0]['backing_file'], "")
         self.assertEqual(info[0]['over_committed_disk_size'], 0)
 
diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py
index 94933cf107..acfcffed99 100644
--- a/nova/virt/disk/api.py
+++ b/nova/virt/disk/api.py
@@ -148,6 +148,16 @@ def get_disk_size(path):
     return images.qemu_img_info(path).virtual_size
 
 
+def get_allocated_disk_size(path):
+    """Get the allocated size of a disk image
+
+    :param path: Path to the disk image
+    :returns: Size (in bytes) of the given disk image as allocated on the
+              filesystem
+    """
+    return images.qemu_img_info(path).disk_size
+
+
 def extend(image, size):
     """Increase image to size.
 
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 8886f77b24..6311d9c28c 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -7138,7 +7138,7 @@ class LibvirtDriver(driver.ComputeDriver):
                             fp = os.path.join(dirpath, f)
                             dk_size += os.path.getsize(fp)
                 else:
-                    dk_size = int(os.path.getsize(path))
+                    dk_size = disk_api.get_allocated_disk_size(path)
             elif disk_type == 'block' and block_device_info:
                 dk_size = lvm.get_volume_size(path)
             else: