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

pbs-restore: be more verbose if asked to

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2020-05-30 16:06:01 +02:00
parent c6979241f1
commit bce72611f9
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
debian/patches/pve/0032-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch vendored
View File

@ -4,10 +4,11 @@ Date: Mon, 6 Apr 2020 12:17:01 +0200
Subject: [PATCH] PVE-Backup: pbs-restore - new command to restore from proxmox Subject: [PATCH] PVE-Backup: pbs-restore - new command to restore from proxmox
backup server backup server
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
Makefile | 4 +- Makefile | 4 +-
pbs-restore.c | 206 ++++++++++++++++++++++++++++++++++++++++++++++++++ pbs-restore.c | 216 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 209 insertions(+), 1 deletion(-) 2 files changed, 219 insertions(+), 1 deletion(-)
create mode 100644 pbs-restore.c create mode 100644 pbs-restore.c
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
@ -34,10 +35,10 @@ index dbd9542ae4..7c1fb58e18 100644
diff --git a/pbs-restore.c b/pbs-restore.c diff --git a/pbs-restore.c b/pbs-restore.c
new file mode 100644 new file mode 100644
index 0000000000..0b24e35403 index 0000000000..ecf4cb5c22
--- /dev/null --- /dev/null
+++ b/pbs-restore.c +++ b/pbs-restore.c
@@ -0,0 +1,206 @@ @@ -0,0 +1,216 @@
+/* +/*
+ * Qemu image restore helper for Proxmox Backup + * Qemu image restore helper for Proxmox Backup
+ * + *
@ -197,6 +198,9 @@ index 0000000000..0b24e35403
+ bdrv_init(); + bdrv_init();
+ module_call_init(MODULE_INIT_QOM); + module_call_init(MODULE_INIT_QOM);
+ +
+ if (verbose) {
+ fprintf(stderr, "connecting to repository '%s'\n", repository);
+ }
+ char *pbs_error = NULL; + char *pbs_error = NULL;
+ ProxmoxRestoreHandle *conn = proxmox_restore_connect( + ProxmoxRestoreHandle *conn = proxmox_restore_connect(
+ repository, snapshot, password, keyfile, key_password, fingerprint, &pbs_error); + repository, snapshot, password, keyfile, key_password, fingerprint, &pbs_error);
@ -211,6 +215,10 @@ index 0000000000..0b24e35403
+ qdict_put_str(options, "driver", format); + qdict_put_str(options, "driver", format);
+ } + }
+ +
+
+ if (verbose) {
+ fprintf(stderr, "open block backend for target '%s'\n", target);
+ }
+ Error *local_err = NULL; + Error *local_err = NULL;
+ int flags = BDRV_O_RDWR; + int flags = BDRV_O_RDWR;
+ BlockBackend *blk = blk_new_open(target, NULL, options, flags, &local_err); + BlockBackend *blk = blk_new_open(target, NULL, options, flags, &local_err);
@ -227,6 +235,9 @@ index 0000000000..0b24e35403
+ +
+ // blk_set_enable_write_cache(blk, !writethrough); + // blk_set_enable_write_cache(blk, !writethrough);
+ +
+ if (verbose) {
+ fprintf(stderr, "starting to restore snapshot '%s'\n", snapshot);
+ }
+ int res = proxmox_restore_image( + int res = proxmox_restore_image(
+ conn, + conn,
+ archive_name, + archive_name,