j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2026-11-08 11:16:47 +00:00
Code Issues Projects Releases Wiki Activity

perf(instances): the VM page lists ISO images without reading every pool

Browse source 
The VM page refreshed every active storage pool to list the ISO images
for its CD-ROM drives. A pool holding large disk images took up to
seconds to refresh, most of the page's time, on every page load.

The page now lists the ISO images libvirt already knows. Images
uploaded through the panel are known at once. For an image copied to a
pool by hand, the Removable media section has a Refresh ISO list button
that refreshes the active pools and returns to the page.
This commit is contained in:
catborise 2026-11-02 13:51:20 +03:00
parent 37905a0b75
commit d5d054de71
6 changed files with 52 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
instances/templates/instances/settings_tab.html
View file

@ -152,7 +152,13 @@
<section class="mb-4" aria-labelledby="media-heading">
<div class="d-flex flex-wrap justify-content-between align-items-center gap-2 mb-2">
<h2 class="h6 mb-0" id="media-heading">{% trans "Removable media" %}</h2>
{% include 'add_instance_cdrom.html' %}
<div class="d-flex gap-2">
{# the pools are read again: an ISO image copied to one by hand is listed then #}
<form method="post" action="{% url 'instances:refresh_iso' instance.id %}">{% csrf_token %}
<button type="submit" class="btn btn-sm btn-outline-secondary" title="{% trans "Read the storage pools again: an ISO image copied to a pool by hand is listed then" %}">{% bs_icon 'arrow-clockwise' %} {% trans "Refresh ISO list" %}</button>
</form>
{% include 'add_instance_cdrom.html' %}
</div>
</div>
{% for cd in instance.media %}
<div class="card mb-2">

8
instances/tests/test_disk_isolation.py
View file

@ -23,6 +23,7 @@ DISK_ENDPOINTS = [
("detach_cdrom", ["hda"]),
("mount_iso", []),
("unmount_iso", []),
("refresh_iso", []),
]
VM_DISK = {
@ -86,6 +87,13 @@ class DiskViewsTenantIsolationTestCase(TestCase):
mock_storage.assert_not_called()
mock_create.assert_not_called()
def test_refresh_iso_reads_the_pools_again_and_returns_to_the_disks_tab(self):
self.client.force_login(self.superuser)
with patch("instances.models.wvmInstance") as mock_wvm:
res = self._post("refresh_iso", {})
self.assertRedirects(res, self.referer + "#disks", fetch_redirect_response=False)
mock_wvm.return_value.refresh_iso_pools.assert_called_once_with()
def test_delete_vol_deletes_the_volume_attached_to_dev_not_the_posted_one(self):
self.client.force_login(self.superuser)
with patch("instances.models.wvmInstance") as mock_wvm, patch(

1
instances/urls.py
View file

@ -40,6 +40,7 @@ urlpatterns = [
path("<int:pk>/detach_cdrom/<str:dev>/", views.detach_cdrom, name="detach_cdrom"),
path("<int:pk>/unmount_iso/", views.unmount_iso, name="unmount_iso"),
path("<int:pk>/mount_iso/", views.mount_iso, name="mount_iso"),
path("<int:pk>/refresh_iso/", views.refresh_iso, name="refresh_iso"),
path("<int:pk>/snapshot/", views.snapshot, name="snapshot"),
path("<int:pk>/delete_snapshot/", views.delete_snapshot, name="delete_snapshot"),
path("<int:pk>/revert_snapshot/", views.revert_snapshot, name="revert_snapshot"),

8
instances/views.py
View file

@ -1685,6 +1685,14 @@ def mount_iso(request, pk):
return redirect(same_origin_referer(request, reverse("instances:instance", args=[pk])) + "#disks")
@require_POST
@superuser_only
def refresh_iso(request, pk):
instance = get_instance(request.user, pk, perm_type="change")
instance.proxy.refresh_iso_pools()
return _back(request, pk, "disks")
@require_POST
def snapshot(request, pk):
return _snapshot_job(request, pk, "snapshot.create",

12
vrtManager/instance.py
View file

@ -1713,12 +1713,18 @@ class wvmInstance(wvmConnect):
if active:
self.instance.blockResize(disk["path"], disk["size_new"], VIR_DOMAIN_BLOCK_RESIZE_BYTES)
def refresh_iso_pools(self):
"""Refresh the active pools, so that an image copied to one by hand
is listed by get_iso_media."""
for pool in self.wvm.listAllStoragePools(VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE):
with contextlib.suppress(libvirtError): # stopped or removed meanwhile
pool.refresh(0)
def get_iso_media(self):
"""The .iso volumes libvirt knows in the active pools; one copied in
by hand is known after refresh_iso_pools."""
iso = []
for pool in self.wvm.listAllStoragePools(VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE):
# refreshed so that an image copied to the pool by hand shows up
with contextlib.suppress(libvirtError):
pool.refresh(0)
try:
names = pool.listVolumes()
except libvirtError: # stopped or removed meanwhile

34
vrtManager/tests/test_iso_media.py
View file

@ -69,31 +69,35 @@ def pool(volumes, refresh_error=False, list_error=False):
class IsoListTestCase(unittest.TestCase):
"""The CD-ROM choices are the .iso volumes of the active pools, refreshed
so that an image copied in by hand shows up."""
"""The CD-ROM choices are the .iso volumes libvirt knows in the active
pools; the pools are read again only when asked."""
def iso(self, *pools):
def wvm(self, *pools):
inst = wvmInstance.__new__(wvmInstance)
inst.wvm = MagicMock()
inst.wvm.listAllStoragePools.return_value = list(pools)
return inst, inst.get_iso_media()
return inst
def test_iso_volumes_of_the_active_pools(self):
def test_iso_volumes_of_the_active_pools_without_a_refresh(self):
a, b = pool(["a.iso", "disk.qcow2"]), pool(["B.ISO"])
inst, iso = self.iso(a, b)
self.assertEqual(iso, ["a.iso", "B.ISO"])
inst = self.wvm(a, b)
self.assertEqual(inst.get_iso_media(), ["a.iso", "B.ISO"])
inst.wvm.listAllStoragePools.assert_called_once_with(VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE)
a.refresh.assert_not_called()
b.refresh.assert_not_called()
def test_a_pool_stopped_meanwhile_is_skipped(self):
inst = self.wvm(pool([], list_error=True), pool(["b.iso"]))
self.assertEqual(inst.get_iso_media(), ["b.iso"])
def test_refresh_reads_every_active_pool_again(self):
a, b = pool([], refresh_error=True), pool([])
inst = self.wvm(a, b)
inst.refresh_iso_pools()
inst.wvm.listAllStoragePools.assert_called_once_with(VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE)
a.refresh.assert_called_once_with(0)
b.refresh.assert_called_once_with(0)
def test_a_failed_refresh_still_lists_the_pool(self):
_, iso = self.iso(pool(["a.iso"], refresh_error=True))
self.assertEqual(iso, ["a.iso"])
def test_a_pool_stopped_meanwhile_is_skipped(self):
_, iso = self.iso(pool([], list_error=True), pool(["b.iso"]))
self.assertEqual(iso, ["b.iso"])
if __name__ == "__main__":
unittest.main()