From a63c97fd2d13de532330523587894163e32a892f Mon Sep 17 00:00:00 2001 From: hutianhao27 Date: Tue, 17 Sep 2019 01:56:56 +0000 Subject: [PATCH] Revert "nova shared storage: rbd is always shared storage" This reverts commit 05b7f63a42e3512da6fe45d2e6639fb47ed8102b. The _is_storage_shared_with method is specifically checking if the instance directory is shared. It is not checking if the actual instance disks are shared and as a result assumptions cannot be made based on the value of images_type. Closes-Bug: 1824858 Change-Id: I52293b6ce3e1ce77fa31b382d0067fb3bc68b21f (cherry picked from commit 404932f82130445472837095b3ad9089c75e2660) (cherry picked from commit 890882ebbf74db14a7c1904cca96cd7f5907493b) --- nova/tests/unit/virt/libvirt/test_driver.py | 1 - nova/virt/libvirt/driver.py | 4 ---- 2 files changed, 5 deletions(-) diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index b47a19098009..1b0fb66c0581 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -9658,7 +9658,6 @@ class LibvirtConnTestCase(test.NoDBTestCase, self.assertTrue(drvr._is_shared_block_storage(instance, data, block_device_info=bdi)) self.assertEqual(0, mock_get_instance_disk_info.call_count) - self.assertTrue(drvr._is_storage_shared_with('foo', 'bar')) def test_is_shared_block_storage_lvm(self): self.flags(images_type='lvm', group='libvirt') diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index bccf3eb03a17..741a6cb12ec8 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -8746,10 +8746,6 @@ class LibvirtDriver(driver.ComputeDriver): # on the same filesystem: the source and dest IP are the # same, or we create a file on the dest system via SSH # and check whether the source system can also see it. - # NOTE (drwahl): Actually, there is a 3rd way: if images_type is rbd, - # it will always be shared storage - if CONF.libvirt.images_type == 'rbd': - return True shared_storage = (dest == self.get_host_ip_addr()) if not shared_storage: tmp_file = uuidutils.generate_uuid(dashed=False) + '.tmp'