From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id ED96069BCE for ; Fri, 25 Mar 2022 09:38:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EB7C637606 for ; Fri, 25 Mar 2022 09:38:12 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id F41A7375FD for ; Fri, 25 Mar 2022 09:38:11 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id CD384426DB for ; Fri, 25 Mar 2022 09:38:11 +0100 (CET) From: Daniel Tschlatscher To: pve-devel@lists.proxmox.com Date: Fri, 25 Mar 2022 09:34:38 +0100 Message-Id: <20220325083437.498400-1-d.tschlatscher@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.359 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-qemu v2] fix: 3865: backup restore human readable output X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Mar 2022 08:38:13 -0000 The backup restore dialogue now displays size information and duration in a format more easily understandable for humans. The output was adapated to match the output of the backup create dialogue where possible. Added 2 helper methods for displaying bytes and time in human readable format. Signed-off-by: Daniel Tschlatscher --- Changes to v1: Fixed the indentation (there were a few rogue tab stops) and fixed a typo in the commit message ...VE-Backup-add-vma-backup-format-code.patch | 117 ++++++++++++++---- 1 file changed, 96 insertions(+), 21 deletions(-) diff --git a/debian/patches/pve/0026-PVE-Backup-add-vma-backup-format-code.patch b/debian/patches/pve/0026-PVE-Backup-add-vma-backup-format-code.patch index c4ed5bb..54394ff 100644 --- a/debian/patches/pve/0026-PVE-Backup-add-vma-backup-format-code.patch +++ b/debian/patches/pve/0026-PVE-Backup-add-vma-backup-format-code.patch @@ -9,11 +9,11 @@ Signed-off-by: Fabian Ebner --- block/meson.build | 2 + meson.build | 5 + - vma-reader.c | 857 ++++++++++++++++++++++++++++++++++++++++++++++ - vma-writer.c | 790 ++++++++++++++++++++++++++++++++++++++++++ - vma.c | 851 +++++++++++++++++++++++++++++++++++++++++++++ - vma.h | 150 ++++++++ - 6 files changed, 2655 insertions(+) + vma-reader.c | 922 ++++++++++++++++++++++++++++++++++++++++++++++ + vma-writer.c | 790 +++++++++++++++++++++++++++++++++++++++ + vma.c | 857 ++++++++++++++++++++++++++++++++++++++++++ + vma.h | 153 ++++++++ + 6 files changed, 2729 insertions(+) create mode 100644 vma-reader.c create mode 100644 vma-writer.c create mode 100644 vma.c @@ -57,10 +57,10 @@ index 96de1a6ef9..54c23b9567 100644 subdir('contrib/elf2dmp') diff --git a/vma-reader.c b/vma-reader.c new file mode 100644 -index 0000000000..2b1d1cdab3 +index 0000000000..907759b295 --- /dev/null +++ b/vma-reader.c -@@ -0,0 +1,857 @@ +@@ -0,0 +1,922 @@ +/* + * VMA: Virtual Machine Archive + * @@ -77,6 +77,7 @@ index 0000000000..2b1d1cdab3 +#include "qemu/osdep.h" +#include +#include ++#include + +#include "qemu-common.h" +#include "qemu/timer.h" @@ -87,6 +88,9 @@ index 0000000000..2b1d1cdab3 + +static unsigned char zero_vma_block[VMA_BLOCK_SIZE]; + ++static time_t last_time = 0; ++static int64_t last_size = 0; ++ +typedef struct VmaRestoreState { + BlockBackend *target; + bool write_zeroes; @@ -649,13 +653,31 @@ index 0000000000..2b1d1cdab3 + + if (verbose) { + time_t duration = time(NULL) - vmar->start_time; -+ int percent = (vmar->clusters_read*100)/vmar->cluster_count; -+ if (percent != vmar->clusters_read_per) { -+ printf("progress %d%% (read %zd bytes, duration %zd sec)\n", -+ percent, vmar->clusters_read*VMA_CLUSTER_SIZE, -+ duration); ++ int percent = (vmar->clusters_read*100) / vmar->cluster_count; ++ ++ /* Dont spam so many progress prints, but still show the 100% message*/ ++ if ((duration - last_time) > 2 || percent == 100) { ++ int delta = duration - last_time; ++ int64_t bps = vmar->clusters_read*VMA_CLUSTER_SIZE - last_size; ++ ++ if (delta != 0) ++ bps /= delta; ++ ++ printf("Progress %d%% (", percent); ++ print_human_readable_byte_count(vmar->clusters_read*VMA_CLUSTER_SIZE); ++ printf(" of "); ++ print_human_readable_byte_count(vmar->devinfo[dev_id].size); ++ printf(") in "); ++ print_human_readable_time(duration); ++ printf(" - "); ++ print_human_readable_byte_count(bps); ++ printf("/s\n"); ++ + fflush(stdout); ++ + vmar->clusters_read_per = percent; ++ last_time = duration; ++ last_size = vmar->clusters_read*VMA_CLUSTER_SIZE; + } + } + @@ -881,11 +903,17 @@ index 0000000000..2b1d1cdab3 + + if (verbose) { + if (vmar->clusters_read) { -+ printf("total bytes read %zd, sparse bytes %zd (%.3g%%)\n", -+ vmar->clusters_read*VMA_CLUSTER_SIZE, -+ vmar->zero_cluster_data, -+ (double)(100.0*vmar->zero_cluster_data)/ -+ (vmar->clusters_read*VMA_CLUSTER_SIZE)); ++ double sparse_percent = (double)(100.0*vmar->zero_cluster_data) / ++ (vmar->clusters_read*VMA_CLUSTER_SIZE); ++ time_t duration = time(NULL) - vmar->start_time; ++ ++ printf("Finished restoring "); ++ print_human_readable_byte_count(vmar->clusters_read*VMA_CLUSTER_SIZE); ++ printf(" bytes in "); ++ print_human_readable_time(duration); ++ printf(" with "); ++ print_human_readable_byte_count(vmar->zero_cluster_data); ++ printf(" of sparse data. (%.3g%%)\n", sparse_percent); + + int64_t datasize = vmar->clusters_read*VMA_CLUSTER_SIZE-vmar->zero_cluster_data; + if (datasize) { // this does not make sense for empty files @@ -918,6 +946,44 @@ index 0000000000..2b1d1cdab3 + return vma_reader_restore_full(vmar, -1, verbose, true, errp); +} + ++void print_human_readable_time(int seconds) { ++ int days, hours, mins; ++ ++ days = seconds / 86400; ++ seconds = seconds % 86400; ++ ++ hours = seconds / 3600; ++ seconds = seconds % 3600; ++ ++ mins = seconds / 60; ++ seconds = seconds % 60; ++ ++ if (days) ++ printf("%d d ", days); ++ if (hours) ++ printf("%d h ", hours); ++ if (mins) ++ printf("%d m ", mins); ++ printf("%d s", seconds); ++} ++ ++/* This should correctly display values up to 9,2 Ebibytes*/ ++void print_human_readable_byte_count(int64_t value) { ++ double calculated = (double)value; ++ const char* units = "KMGTPE"; ++ char unit; ++ ++ int maxUnit = 0; ++ if (value > 1023) { ++ maxUnit = (int)(log(value)/log(1024)); ++ calculated = value / pow(1024, maxUnit); ++ unit = units[maxUnit - 1]; ++ printf("%.2f %ciB", calculated, unit); ++ } else { ++ printf("%zd B", (int64_t)calculated); ++ } ++} +\ No newline at end of file diff --git a/vma-writer.c b/vma-writer.c new file mode 100644 index 0000000000..11d8321ffd @@ -1716,10 +1782,10 @@ index 0000000000..11d8321ffd +} diff --git a/vma.c b/vma.c new file mode 100644 -index 0000000000..df542b7732 +index 0000000000..781b5bf700 --- /dev/null +++ b/vma.c -@@ -0,0 +1,851 @@ +@@ -0,0 +1,857 @@ +/* + * VMA: Virtual Machine Archive + * @@ -1802,8 +1868,14 @@ index 0000000000..df542b7732 + if (strcmp(di->devname, "vmstate") == 0) { + printf("VMSTATE: dev_id=%d memory: %zd\n", i, di->size); + } else { ++ /* Information that is needed in qemu-server (PVE::QemuServer.pm) ++ Change only if you know what you are doing */ + printf("DEV: dev_id=%d size: %zd devname: %s\n", + i, di->size, di->devname); ++ ++ printf("Info: dev_id=%d size: ", i); ++ print_human_readable_byte_count(di->size); ++ printf(" devname: %s\n", di->devname); + } + } + } @@ -2573,10 +2645,10 @@ index 0000000000..df542b7732 +} diff --git a/vma.h b/vma.h new file mode 100644 -index 0000000000..c895c97f6d +index 0000000000..c4867b8584 --- /dev/null +++ b/vma.h -@@ -0,0 +1,150 @@ +@@ -0,0 +1,153 @@ +/* + * VMA: Virtual Machine Archive + * @@ -2726,4 +2798,7 @@ index 0000000000..c895c97f6d + Error **errp); +int vma_reader_verify(VmaReader *vmar, bool verbose, Error **errp); + ++void print_human_readable_time(int); ++void print_human_readable_byte_count(int64_t); ++ +#endif /* BACKUP_VMA_H */ -- 2.30.2