Skip to content

KVM: allow cluster-wide storage pools for VM deployment from volumes #14362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
weizhouapache wants to merge 1 commit into
base: main
Choose a base branch
from
+57 −28
Draft

KVM: allow cluster-wide storage pools for VM deployment from volumes #14362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7011,8 +7011,9 @@ private VolumeInfo getVolume(long id, Long templateId, boolean isSnapshot) {
if (volume != null) {
if (!isSnapshot
&& (volume.getDataStore() == null
|| !ScopeType.ZONE.equals(volume.getDataStore().getScope().getScopeType()))) {
throw new InvalidParameterValueException("Deployment of virtual machine is supported only for Zone-wide storage pools");
|| (!ScopeType.ZONE.equals(volume.getDataStore().getScope().getScopeType())
&& !ScopeType.CLUSTER.equals(volume.getDataStore().getScope().getScopeType())))) {
throw new InvalidParameterValueException("Deployment of virtual machine is supported only for Zone-wide or Cluster-wide storage pools");
Comment on lines +7014 to +7016
}
checkIfVolumeTemplateIsTheSameAsTheProvided(volume, templateId);
if (volume.getInstanceId() != null && !isSnapshot) {
Expand Down
4 changes: 2 additions & 2 deletions server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4213,7 +4213,7 @@ public void createVirtualMachineWithVolumeFromNonZoneScopedStorageFails() {

InvalidParameterValueException ex = assertThrows(InvalidParameterValueException.class,
() -> userVmManagerImpl.createVirtualMachine(deployVMCmd));
assertEquals("Deployment of virtual machine is supported only for Zone-wide storage pools", ex.getMessage());
assertEquals("Deployment of virtual machine is supported only for Zone-wide or Cluster-wide storage pools", ex.getMessage());
}

@Test
Expand All @@ -4229,7 +4229,7 @@ public void createVirtualMachineWithVolumeWithNullDataStoreFails() {

InvalidParameterValueException ex = assertThrows(InvalidParameterValueException.class,
() -> userVmManagerImpl.createVirtualMachine(deployVMCmd));
assertEquals("Deployment of virtual machine is supported only for Zone-wide storage pools", ex.getMessage());
assertEquals("Deployment of virtual machine is supported only for Zone-wide or Cluster-wide storage pools", ex.getMessage());
}

@Test
Expand Down
76 changes: 52 additions & 24 deletions test/integration/smoke/test_vm_lifecycle_with_snapshot_or_volume.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,19 @@
from marvin.codes import FAILED, PASS
from nose.plugins.attrib import attr

import uuid
import unittest

class TestDeployVMFromSnapshotOrVolume(cloudstackTestCase):

def rbd_snapshot_cannot_outlive_source_volume(self):
'''
On RBD, a snapshot lives on primary storage with its parent
volume, so with snapshot.backup.to.secondary=false, deleting the
parent volume destroys the snapshot too - it can no longer be
used to deploy a new volume/VM afterward.
'''
return self.storage_pool.type == 'RBD'

@classmethod
def setUpClass(cls):
testClient = super(TestDeployVMFromSnapshotOrVolume, cls).getClsTestClient()
Expand Down Expand Up @@ -80,23 +88,33 @@ def setUpClass(cls):
cls._cleanup.append(cls.account)
cls.debug(cls.account.id)

# Prefer a zone-wide pool, but also accept a cluster-scope NFS/RBD pool.
storage_pools_response = list_storage_pools(cls.apiclient,
zoneid=cls.zone.id,
scope="ZONE")

if not storage_pools_response:
cluster_storage_pools = list_storage_pools(cls.apiclient,
zoneid=cls.zone.id,
scope="CLUSTER") or []
storage_pools_response = [
pool for pool in cluster_storage_pools
if getattr(pool, "type", None) in ("NetworkFilesystem", "RBD")
]

if storage_pools_response:
cls.zone_wide_storage = storage_pools_response[0]
cls.storage_pool = storage_pools_response[0]
Comment on lines +91 to +106

cls.debug(
"zone wide storage id is %s" %
cls.zone_wide_storage.id)
"storage pool id is %s, scope is %s" %
(cls.storage_pool.id, cls.storage_pool.scope))
update1 = StoragePool.update(cls.apiclient,
id=cls.zone_wide_storage.id,
id=cls.storage_pool.id,
tags="test-vm"
)
cls.debug(
"Storage %s pool tag%s" %
(cls.zone_wide_storage.id, update1.tags))
(cls.storage_pool.id, update1.tags))
cls.service_offering = ServiceOffering.create(
cls.apiclient,
cls.services["service_offerings"]["small"],
Expand All @@ -116,7 +134,7 @@ def setUpClass(cls):
)
cls._cleanup.append(cls.disk_offering)
else:
raise unittest.SkipTest("No zone wide storage found. Skipping tests")
raise unittest.SkipTest("No zone-wide or cluster-scope NFS/RBD storage pool found. Skipping tests")


cls.virtual_machine = VirtualMachine.create(
Expand Down Expand Up @@ -177,16 +195,16 @@ def test_03_deploy_vm_with_existing_volume_deleted_template(self):
template = Template.create_from_snapshot(self.apiclient, self.snapshot, services)
self._cleanup.append(template)
virtual_machine = VirtualMachine.create(self.apiclient,
{"name": "Test-%s" % uuid.uuid4()},
self.services['small'],
accountid=self.account.name,
domainid=self.account.domainid,
zoneid=self.zone.id,
serviceofferingid=self.service_offering.id,
templateid=template.id,
mode="basic",
mode=self.services['mode'],
)
Comment on lines +198 to 205
try:
ssh_client = virtual_machine.get_ssh_client()
ssh_client = virtual_machine.get_ssh_client(reconnect=True)
except Exception as e:
self.fail("SSH failed for virtual machine: %s - %s" %
(virtual_machine.ipaddress, e))
Expand All @@ -202,29 +220,35 @@ def test_03_deploy_vm_with_existing_volume_deleted_template(self):
root_volume.id,
)
VirtualMachine.delete(virtual_machine, self.apiclient, expunge=True)
self.create_volume_from_snapshot_deploy_vm(snapshot.id)
if not self.rbd_snapshot_cannot_outlive_source_volume():
self.create_volume_from_snapshot_deploy_vm(snapshot.id)

@attr(tags=["advanced"], required_hardware="false")
def test_04_deploy_vm_with_existing_snapshot_deleted_template(self):
'''
Deploy a Virtual machine with existing snapshot of a ROOT volume created from a templated which was deleted
'''
if self.rbd_snapshot_cannot_outlive_source_volume():
raise unittest.SkipTest(
"Covered by test_03 on RBD: deploying from a snapshot after "
"its source ROOT volume was deleted is not supported here."
)
services = {"displaytext": "Template-1", "name": "Template-1-name", "ostypeid": self.template.ostypeid,
"ispublic": "true"}

template = Template.create_from_snapshot(self.apiclient, self.snapshot, services)
self._cleanup.append(template)
virtual_machine = VirtualMachine.create(self.apiclient,
{"name": "Test-%s" % uuid.uuid4()},
self.services['small'],
accountid=self.account.name,
domainid=self.account.domainid,
zoneid=self.zone.id,
serviceofferingid=self.service_offering.id,
templateid=template.id,
mode="basic",
mode=self.services['mode'],
)
try:
ssh_client = virtual_machine.get_ssh_client()
ssh_client = virtual_machine.get_ssh_client(reconnect=True)
except Exception as e:
self.fail("SSH failed for virtual machine: %s - %s" %
(virtual_machine.ipaddress, e))
Expand All @@ -247,18 +271,22 @@ def test_05_deploy_vm_with_existing_snapshot_deleted_volume(self):
'''
Deploy a Virtual machine with existing snapshot of a ROOT volume which was deleted
'''

if self.rbd_snapshot_cannot_outlive_source_volume():
raise unittest.SkipTest(
"Covered by test_03 on RBD: deploying from a snapshot after "
"its source ROOT volume was deleted is not supported here."
)
virtual_machine = VirtualMachine.create(self.apiclient,
{"name": "Test-%s" % uuid.uuid4()},
self.services['small'],
accountid=self.account.name,
domainid=self.account.domainid,
zoneid=self.zone.id,
serviceofferingid=self.service_offering.id,
templateid=self.template.id,
mode="basic",
mode=self.services['mode'],
)
try:
ssh_client = virtual_machine.get_ssh_client()
ssh_client = virtual_machine.get_ssh_client(reconnect=True)
except Exception as e:
self.fail("SSH failed for virtual machine: %s - %s" %
(virtual_machine.ipaddress, e))
Expand All @@ -278,16 +306,16 @@ def test_05_deploy_vm_with_existing_snapshot_deleted_volume(self):

def deploy_vm_from_snapshot(self, snapshot):
virtual_machine = VirtualMachine.create(self.apiclient,
{"name": "Test-%s" % uuid.uuid4()},
self.services['small'],
accountid=self.account.name,
domainid=self.account.domainid,
zoneid=self.zone.id,
serviceofferingid=self.service_offering.id,
snapshotid=snapshot.id,
mode="basic",
mode=self.services['mode'],
)
try:
ssh_client = virtual_machine.get_ssh_client()
ssh_client = virtual_machine.get_ssh_client(reconnect=True)
except Exception as e:
self.fail("SSH failed for virtual machine: %s - %s" %
(virtual_machine.ipaddress, e))
Expand All @@ -303,16 +331,16 @@ def create_volume_from_snapshot_deploy_vm(self, snapshotid):
zoneid=self.zone.id,
)
virtual_machine = VirtualMachine.create(self.apiclient,
{"name": "Test-%s" % uuid.uuid4()},
self.services['small'],
accountid=self.account.name,
domainid=self.account.domainid,
zoneid=self.zone.id,
serviceofferingid=self.service_offering.id,
volumeid=volume.id,
mode="basic",
mode=self.services['mode'],
)
try:
ssh_client = virtual_machine.get_ssh_client()
ssh_client = virtual_machine.get_ssh_client(reconnect=True)
except Exception as e:
self.fail("SSH failed for virtual machine: %s - %s" %
(virtual_machine.ipaddress, e))
Loading