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 D12E86A1A0 for ; Fri, 12 Mar 2021 17:19:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BA226352F6 for ; Fri, 12 Mar 2021 17:18:35 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 2C146352ED for ; Fri, 12 Mar 2021 17:18:35 +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 ED8C442B27 for ; Fri, 12 Mar 2021 17:18:34 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Cc: Thomas Lamprecht Date: Fri, 12 Mar 2021 17:18:22 +0100 Message-Id: <20210312161822.13813-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.184 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH zfsonlinux] update submodule and patches to zfs-2.0.4 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, 12 Mar 2021 16:19:05 -0000 Signed-off-by: Stoiko Ivanov --- 2.0.4 was tagged earlier this week and contains a few minor fixes (including Thomas' patch for zpool output). Tested very roughly by running ztest on a VM ...-intend-continuation-from-removal-st.patch | 48 ------------------- debian/patches/series | 1 - upstream | 2 +- 3 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 debian/patches/0010-zpool-use-tab-to-intend-continuation-from-removal-st.patch diff --git a/debian/patches/0010-zpool-use-tab-to-intend-continuation-from-removal-st.patch b/debian/patches/0010-zpool-use-tab-to-intend-continuation-from-removal-st.patch deleted file mode 100644 index 02d31d24..00000000 --- a/debian/patches/0010-zpool-use-tab-to-intend-continuation-from-removal-st.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Thomas Lamprecht -Date: Tue, 2 Mar 2021 09:22:07 +0100 -Subject: [PATCH] zpool: use tab to intend continuation from removal status - -Bring the output of the removal status in line with the other -"fields" that zpool status outputs, and thus allows an parser to -easier detect this as continuation of the 'remove:' output. - -Before: -remove: Removal of vdev 0 copied 282G in 0h9m, completed on [...] - 776K memory used for removed device mappings - -Now: -remove: Removal of vdev 0 copied 282G in 0h9m, completed on [...] - 776K memory used for removed device mappings - -Signed-off-by: Thomas Lamprecht ---- - cmd/zpool/zpool_main.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c -index 50adc0add..5a5a5eda0 100644 ---- a/cmd/zpool/zpool_main.c -+++ b/cmd/zpool/zpool_main.c -@@ -7736,8 +7736,8 @@ print_removal_status(zpool_handle_t *zhp, pool_removal_stat_t *prs) - * do not print estimated time if hours_left is more than - * 30 days - */ -- (void) printf(gettext(" %s copied out of %s at %s/s, " -- "%.2f%% done"), -+ (void) printf(gettext( -+ "\t%s copied out of %s at %s/s, %.2f%% done"), - examined_buf, total_buf, rate_buf, 100 * fraction_done); - if (hours_left < (30 * 24)) { - (void) printf(gettext(", %lluh%um to go\n"), -@@ -7752,8 +7752,8 @@ print_removal_status(zpool_handle_t *zhp, pool_removal_stat_t *prs) - if (prs->prs_mapping_memory > 0) { - char mem_buf[7]; - zfs_nicenum(prs->prs_mapping_memory, mem_buf, sizeof (mem_buf)); -- (void) printf(gettext(" %s memory used for " -- "removed device mappings\n"), -+ (void) printf(gettext( -+ "\t%s memory used for removed device mappings\n"), - mem_buf); - } - } diff --git a/debian/patches/series b/debian/patches/series index 88c888e2..91b8a3b1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,4 +7,3 @@ 0007-Use-installed-python3.patch 0008-Add-systemd-unit-for-importing-specific-pools.patch 0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch -0010-zpool-use-tab-to-intend-continuation-from-removal-st.patch diff --git a/upstream b/upstream index 9f5f8662..6150fbe6 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit 9f5f86626620c52ad1bebf27d17cece6a28d39a0 +Subproject commit 6150fbe67f7a9485eaabbca7df9a66852cda6892 -- 2.20.1