c/pve-qemu-qoup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vma: create: register all streams before entering coroutines

Browse Source 
Otherwise, the header might already get written by a coroutine and
registering further streams will fail after that.

Also adds a missing g_list_free call for the other GList that's used.

Reported in the community forum:
https://forum.proxmox.com/threads/104744/

Reproducer script (increase beyond 30 if the issue isn't triggered yet):
> #!/usr/bin/perl
>
> my $dir = "./vma-create-bug";
> mkdir $dir;
>
> my $archive_path = "$dir/vzdump-qemu-104-2202_02_02-00_00_00.vma";
> unlink $archive_path;
>
> my $cmd = "vma create $archive_path -v";
> for (my $i = 0; $i < 30; $i++) {
>   system("truncate -s 1M $dir/drive-virtio$i.img");
>   $cmd .= " drive-virtio$i=$dir/drive-virtio$i.img";
> }
> system($cmd);

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2022-02-14 12:02:52 +01:00 committed by Thomas Lamprecht
parent c07b2203b3
commit 2bf61c3eb6
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
debian/patches/pve/0025-PVE-Backup-add-vma-backup-format-code.patch vendored
View File

@ -4,14 +4,16 @@ Date: Mon, 6 Apr 2020 12:16:57 +0200
Subject: [PATCH] PVE-Backup: add vma backup format code Subject: [PATCH] PVE-Backup: add vma backup format code
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
[FE: create: register all streams before entering coroutines]
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
--- ---
block/meson.build | 2 + block/meson.build | 2 +
meson.build | 5 + meson.build | 5 +
vma-reader.c | 857 ++++++++++++++++++++++++++++++++++++++++++++++ vma-reader.c | 857 ++++++++++++++++++++++++++++++++++++++++++++++
vma-writer.c | 790 ++++++++++++++++++++++++++++++++++++++++++ vma-writer.c | 790 ++++++++++++++++++++++++++++++++++++++++++
vma.c | 839 +++++++++++++++++++++++++++++++++++++++++++++ vma.c | 851 +++++++++++++++++++++++++++++++++++++++++++++
vma.h | 150 ++++++++ vma.h | 150 ++++++++
6 files changed, 2643 insertions(+) 6 files changed, 2655 insertions(+)
create mode 100644 vma-reader.c create mode 100644 vma-reader.c
create mode 100644 vma-writer.c create mode 100644 vma-writer.c
create mode 100644 vma.c create mode 100644 vma.c
@ -1714,10 +1716,10 @@ index 0000000000..11d8321ffd
+} +}
diff --git a/vma.c b/vma.c diff --git a/vma.c b/vma.c
new file mode 100644 new file mode 100644
index 0000000000..2eea2fc281 index 0000000000..df542b7732
--- /dev/null --- /dev/null
+++ b/vma.c +++ b/vma.c
@@ -0,0 +1,839 @@ @@ -0,0 +1,851 @@
+/* +/*
+ * VMA: Virtual Machine Archive + * VMA: Virtual Machine Archive
+ * + *
@ -2293,6 +2295,7 @@ index 0000000000..2eea2fc281
+ int i, c; + int i, c;
+ int verbose = 0; + int verbose = 0;
+ const char *archivename; + const char *archivename;
+ GList *backup_coroutines = NULL;
+ GList *config_files = NULL; + GList *config_files = NULL;
+ +
+ for (;;) { + for (;;) {
@ -2381,7 +2384,9 @@ index 0000000000..2eea2fc281
+ job->dev_id = dev_id; + job->dev_id = dev_id;
+ +
+ Coroutine *co = qemu_coroutine_create(backup_run, job); + Coroutine *co = qemu_coroutine_create(backup_run, job);
+ qemu_coroutine_enter(co); + // Don't enter coroutine yet, because it might write the header before
+ // all streams can be registered.
+ backup_coroutines = g_list_append(backup_coroutines, co);
+ } + }
+ +
+ VmaStatus vmastat; + VmaStatus vmastat;
@ -2389,6 +2394,13 @@ index 0000000000..2eea2fc281
+ int last_percent = -1; + int last_percent = -1;
+ +
+ if (devcount) { + if (devcount) {
+ GList *entry = backup_coroutines;
+ while (entry && entry->data) {
+ Coroutine *co = entry->data;
+ qemu_coroutine_enter(co);
+ entry = g_list_next(entry);
+ }
+
+ while (1) { + while (1) {
+ main_loop_wait(false); + main_loop_wait(false);
+ vma_writer_get_status(vmaw, &vmastat); + vma_writer_get_status(vmaw, &vmastat);
@ -2453,6 +2465,8 @@ index 0000000000..2eea2fc281
+ g_error("creating vma archive failed"); + g_error("creating vma archive failed");
+ } + }
+ +
+ g_list_free(backup_coroutines);
+ g_list_free(config_files);
+ vma_writer_destroy(vmaw); + vma_writer_destroy(vmaw);
+ return 0; + return 0;
+} +}