Skip to content

Bring back vm.suspend during deleting VM snapshot #4029

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

Merged
DaanHoogland merged 4 commits into from
Apr 16, 2020
Merged

Bring back vm.suspend during deleting VM snapshot #4029

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef58e56
Bring back vm.suspend during deleting VM snapshot
andrijapanicsb Apr 14, 2020
6ae5eb5
catch'em all
DaanHoogland Apr 14, 2020
eeac135
trailing spaces
DaanHoogland Apr 15, 2020
0f5e511
logging on suspend
DaanHoogland Apr 15, 2020
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
7 changes: 7 additions & 0 deletions ...s/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,6 +1005,13 @@ public Answer backupSnapshot(final CopyCommand cmd) {
primaryStore.getUuid());
if (state == DomainInfo.DomainState.VIR_DOMAIN_RUNNING && !primaryStorage.isExternalSnapshot()) {
final DomainSnapshot snap = vm.snapshotLookupByName(snapshotName);
try {
s_logger.info(String.format("Suspending VM '%s' to delete snapshot,", vm.getName()));
vm.suspend();
} catch (final LibvirtException e) {
s_logger.error("Failed to suspend the VM", e);
throw e;
Comment on lines +1008 to +1013
Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland Apr 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comment as in #4033: first we suspend unconditionaly, and than, we just assume it need resuming without checking if it was running in the first place. Are there situations we should guard against more diligently? (cc @weizhouapache @rhtyd )

Copy link
Copy Markdown
Member

@yadvr yadvr Apr 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DaanHoogland I see on line 1007, we are checking that domain is running? Did I miss anything?

Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland Apr 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, we are, i am confusing PRs. this one actually doesn't do anything in the delete vmshapshot scenario.

}
snap.delete(0);

/*
Expand Down