proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-12 02:05:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

snapshot: save state and implement rollback

Browse Source 
We automatically stop the VM on rollback, and start it again when there
is saved state.
This commit is contained in:
Dietmar Maurer 2012-09-12 13:34:55 +02:00
parent 9d6890772d
commit a3222b9184
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
PVE/QemuServer.pm
View File

@ -2831,23 +2831,6 @@ sub qemu_volume_snapshot_delete {
vm_mon_cmd($vmid, "delete-drive-snapshot", device => $deviceid, name => $snap); vm_mon_cmd($vmid, "delete-drive-snapshot", device => $deviceid, name => $snap);
} }
sub qemu_snapshot_start {
my ($vmid, $snap) = @_;
#need to implement statefile location
my $statefile="/tmp/$vmid-$snap";
vm_mon_cmd($vmid, "snapshot-start", statefile => $statefile);
}
sub qemu_snapshot_end {
my ($vmid) = @_;
vm_mon_cmd($vmid, "snapshot-end");
}
sub qga_freezefs { sub qga_freezefs {
my ($vmid) = @_; my ($vmid) = @_;
@ -2914,9 +2897,11 @@ sub vm_start {
if ($statefile eq 'tcp') { if ($statefile eq 'tcp') {
print "migration listens on port $migrate_port\n"; print "migration listens on port $migrate_port\n";
} else { } else {
unlink $statefile; if ($migratedfrom) {
# fixme: send resume - is that necessary ? unlink $statefile;
eval { vm_mon_cmd($vmid, "cont"); }; # fixme: send resume - is that necessary ?
eval { vm_mon_cmd($vmid, "cont"); };
}
} }
} }
@ -3770,11 +3755,16 @@ sub snapshot_rollback {
my $prepare = 1; my $prepare = 1;
my $storecfg = PVE::Storage::config();
my $updatefn = sub { my $updatefn = sub {
my $conf = load_config($vmid); my $conf = load_config($vmid);
check_lock($conf) if $prepare; if ($prepare) {
check_lock($conf);
vm_stop($storecfg, $vmid, undef, undef, 5, undef, undef);
}
die "unable to rollback vm $vmid: vm is running\n" die "unable to rollback vm $vmid: vm is running\n"
if check_running($vmid); if check_running($vmid);
@ -3800,11 +3790,16 @@ sub snapshot_rollback {
} }
update_config_nolock($vmid, $conf, 1); update_config_nolock($vmid, $conf, 1);
if (!$prepare && $snap->{vmstate}) {
my $statefile = PVE::Storage::path($storecfg, $snap->{vmstate});
# fixme: this only forws for files currently
vm_start($storecfg, $vmid, $statefile);
}
}; };
lock_config($vmid, $updatefn); lock_config($vmid, $updatefn);
my $storecfg = PVE::Storage::config();
foreach_drive($snap, sub { foreach_drive($snap, sub {
my ($ds, $drive) = @_; my ($ds, $drive) = @_;
@ -3834,12 +3829,19 @@ sub snapshot_create {
eval { eval {
# create internal snapshots of all drives # create internal snapshots of all drives
qemu_snapshot_start($vmid, $snapname) if $running;
qga_freezefs($vmid) if $running && $freezefs;
my $storecfg = PVE::Storage::config(); my $storecfg = PVE::Storage::config();
if ($running) {
if ($snap->{vmstate}) {
my $path = PVE::Storage::path($storecfg, $snap->{vmstate});
vm_mon_cmd($vmid, "snapshot-start", statefile => $path);
} else {
vm_mon_cmd($vmid, "snapshot-start");
}
};
qga_freezefs($vmid) if $running && $freezefs;
foreach_drive($snap, sub { foreach_drive($snap, sub {
my ($ds, $drive) = @_; my ($ds, $drive) = @_;
@ -3858,7 +3860,7 @@ sub snapshot_create {
eval { gqa_unfreezefs($vmid) if $running && $freezefs; }; eval { gqa_unfreezefs($vmid) if $running && $freezefs; };
warn $@ if $@; warn $@ if $@;
eval { qemu_snapshot_end($vmid) if $running; }; eval { vm_mon_cmd($vmid, "snapshot-end") if $running; };
warn $@ if $@; warn $@ if $@;
if ($err) { if ($err) {