From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH container 1/1] snapshot creation: fsfreeze mountpoints, if needed
Date: Thu, 5 Nov 2020 17:06:31 +0100 [thread overview]
Message-ID: <20201105160631.26834-4-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20201105160631.26834-1-s.ivanov@proxmox.com>
fixes #2991, #2528.
creating a snapshot with rbd, after the syncfs finished successfully does not
guarantee that the snapshot has the state of the filesystem after syncfs.
suggestion taken from #2528 (running fsfreeze -f/-u before snapshotting on
the mountpoints)
added helper PVE::Storage::volume_snapshot_needs_fsfreeze, to indicate
which volumes need to be frozen/thawed. (and mocked it in the tests here).
Added to sync_container_namespace, since fsfreeze needs to run inside the
container's mount namespace.
tests in #2991 seem to indicate that this helps to successfully create backups.
needs a versioned dependency bump on pve-common and pve-storage
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
src/PVE/LXC.pm | 21 +++++++++++++++++----
src/PVE/LXC/Config.pm | 15 ++++++++++++++-
src/test/snapshot-test.pm | 12 +++++++++++-
3 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index 9c150d9..6f87c96 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -1091,7 +1091,7 @@ my $get_container_namespace = sub {
};
my $do_syncfs = sub {
- my ($vmid, $pid, $socket) = @_;
+ my ($vmid, $pid, $socket, $freeze_mountpoints, $thaw) = @_;
&$enter_namespace($vmid, $pid, 'mnt', PVE::Tools::CLONE_NEWNS);
@@ -1121,13 +1121,26 @@ my $do_syncfs = sub {
foreach my $mp (@$mounts) {
my ($what, $dir, $fs) = @$mp;
next if $nosyncfs{$fs};
- eval { PVE::Tools::sync_mountpoint($dir); };
+ eval {
+
+ PVE::Tools::sync_mountpoint($dir) if !$thaw;
+ };
+
+ warn $@ if $@;
+ }
+
+ # freeze/unfreeze the mountpoint which need it
+ foreach my $dir (@$freeze_mountpoints) {
+
+ eval {
+ PVE::Tools::fsfreeze_mountpoint($dir, $thaw);
+ };
warn $@ if $@;
}
};
sub sync_container_namespace {
- my ($vmid) = @_;
+ my ($vmid, $freeze_mountpoints, $thaw) = @_;
my $pid = find_lxc_pid($vmid);
# SOCK_DGRAM is nicer for barriers but cannot be slurped
@@ -1140,7 +1153,7 @@ sub sync_container_namespace {
if (!$child) {
eval {
close $pfd;
- &$do_syncfs($vmid, $pid, $cfd);
+ &$do_syncfs($vmid, $pid, $cfd, $freeze_mountpoints, $thaw);
};
if (my $err = $@) {
warn $err;
diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm
index 49f599b..f7b763b 100644
--- a/src/PVE/LXC/Config.pm
+++ b/src/PVE/LXC/Config.pm
@@ -112,12 +112,25 @@ sub __snapshot_check_freeze_needed {
sub __snapshot_freeze {
my ($class, $vmid, $unfreeze) = @_;
+ my $conf = $class->load_config($vmid);
+ my $storagecfg = PVE::Storage::config();
+
+ my $freeze_mps = [];
+ $class->foreach_volume($conf, sub {
+ my ($ms, $mountpoint) = @_;
+
+ if (PVE::Storage::volume_snapshot_needs_fsfreeze($storagecfg, $mountpoint->{volume})) {
+ push @$freeze_mps, $mountpoint->{mp};
+ }
+ });
+
if ($unfreeze) {
eval { PVE::LXC::thaw($vmid); };
warn $@ if $@;
+ PVE::LXC::sync_container_namespace($vmid, $freeze_mps, 1);
} else {
PVE::LXC::freeze($vmid);
- PVE::LXC::sync_container_namespace($vmid);
+ PVE::LXC::sync_container_namespace($vmid, $freeze_mps, 0);
}
}
diff --git a/src/test/snapshot-test.pm b/src/test/snapshot-test.pm
index bfb8551..91a2af9 100644
--- a/src/test/snapshot-test.pm
+++ b/src/test/snapshot-test.pm
@@ -113,6 +113,15 @@ sub mocked_volume_rollback_is_possible {
die "volume_rollback_is_possible failed\n";
}
+sub mocked_volume_snapshot_needs_fsfreeze {
+ my ($storecfg, $volid) = @_;
+ die "Storage config not mocked! aborting\n"
+ if defined($storecfg);
+ die "volid undefined\n"
+ if !defined($volid);
+ return 0;
+}
+
sub mocked_vm_stop {
if ($kill_possible) {
$running = 0;
@@ -386,7 +395,8 @@ $storage_module->mock('volume_snapshot', \&mocked_volume_snapshot);
$storage_module->mock('volume_snapshot_delete', \&mocked_volume_snapshot_delete);
$storage_module->mock('volume_snapshot_rollback', \&mocked_volume_snapshot_rollback);
$storage_module->mock('volume_rollback_is_possible', \&mocked_volume_rollback_is_possible);
-printf("\tconfig(), volume_snapshot(), volume_snapshot_delete(), volume_snapshot_rollback() and volume_rollback_is_possible() mocked\n");
+$storage_module->mock('volume_snapshot_needs_fsfreeze', \&mocked_volume_snapshot_needs_fsfreeze);
+printf("\tconfig(), volume_snapshot(), volume_snapshot_delete(), volume_snapshot_rollback(), volume_rollback_is_possible() and volume_snapshot_needs_fsfreeze() mocked\n");
printf("\n");
printf("Setting up Mocking for PVE::Tools\n");
--
2.20.1
prev parent reply other threads:[~2020-11-05 16:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-05 16:06 [pve-devel] [PATCH common/storage/container] add fsfreeze/thaw for rbd snapshots Stoiko Ivanov
2020-11-05 16:06 ` [pve-devel] [PATCH common] add fsfreeze helper: Stoiko Ivanov
2020-11-05 16:06 ` [pve-devel] [PATCH storage 1/1] add check for fsfreeze before snapshot Stoiko Ivanov
2020-11-05 18:00 ` Thomas Lamprecht
2020-11-05 16:06 ` Stoiko Ivanov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201105160631.26834-4-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox