Skip to content
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

test: Add a canary for the last external snapshot issue #1687

Merged
merged 1 commit into from
Jun 20, 2024
Merged

test: Add a canary for the last external snapshot issue #1687

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
10 changes: 9 additions & 1 deletion src/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,15 @@ export function vmSupportsExternalSnapshots(config, vm, storagePools) {
return false;
}

// Currently external snapshots work only for disks of type "file"
// HACK - https://gitlab.com/libvirt/libvirt/-/issues/631
//
// Currently external snapshots work only for disks of type
// "file". We work around this by making internal snapshots
// instead in that case. The workaround here should be removed
// when the bug is fixed. Also see:
//
// https://github.com/cockpit-project/cockpit-machines/pull/1554
//
if (!disks.every(disk => disk.type === "file")) {
logDebug(`vmSupportsExternalSnapshots: vm ${vm.name} has unsupported disk type`);
return false;
Expand Down
13 changes: 12 additions & 1 deletion test/check-machines-snapshots
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
# along with Cockpit; If not, see <http://www.gnu.org/licenses/>.

import os
import subprocess
import time
from datetime import datetime

Expand Down Expand Up @@ -318,7 +319,9 @@ class TestMachinesSnapshots(machineslib.VirtualMachinesCase):
m.execute("virsh snapshot-delete subVmTest1 test_snap_1")

# With disk in a pool.
# This will make a internal snapshot.
#
# This will make a internal snapshot because of our workaround for
# https://gitlab.com/libvirt/libvirt/-/issues/631.

p1 = os.path.join(self.vm_tmpdir, "vm_one")
m.execute(f"mkdir --mode 777 {p1}")
Expand All @@ -339,6 +342,14 @@ class TestMachinesSnapshots(machineslib.VirtualMachinesCase):
b.enter_page('/machines')
b.wait_visible("#vm-subVmTest1-disks-vdb-source-volume")

# Let's check whether
# https://gitlab.com/libvirt/libvirt/-/issues/631 has been
# fixed. If so, we can remove our workaround for it in
# helpers.js.
with self.assertRaises(subprocess.CalledProcessError) as cm:
m.execute("virsh snapshot-create-as subVmTest1 snap --disk-only 2>&1")
self.assertIn(b"cannot generate external snapshot name for disk 'vdb' without source", cm.exception.stdout)

SnapshotCreateDialog(
self,
name="withpool",
Expand Down