all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Cc: Thomas Lamprecht <t.lamprecht@proxmox.com>
Subject: [pve-devel] [PATCH zfsonlinux] update submodule and patches to zfs-2.0.4
Date: Fri, 12 Mar 2021 17:18:22 +0100	[thread overview]
Message-ID: <20210312161822.13813-1-s.ivanov@proxmox.com> (raw)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
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 <t.lamprecht@proxmox.com>
-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 <t.lamprecht@proxmox.com>
----
- 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





             reply	other threads:[~2021-03-12 16:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-12 16:18 Stoiko Ivanov [this message]
2021-03-18 15:13 ` [pve-devel] applied: " Thomas Lamprecht

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=20210312161822.13813-1-s.ivanov@proxmox.com \
    --to=s.ivanov@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    --cc=t.lamprecht@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal