From 548b12af1d676cdd9fa9747761ba7b1bb4a8d8af Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Sun, 7 Mar 2021 15:54:23 +0100 Subject: [PATCH] backport "zpool: use tab to intend continuation from removal status" Signed-off-by: Thomas Lamprecht --- ...-intend-continuation-from-removal-st.patch | 48 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 49 insertions(+) create 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 new file mode 100644 index 0000000..02d31d2 --- /dev/null +++ b/debian/patches/0010-zpool-use-tab-to-intend-continuation-from-removal-st.patch @@ -0,0 +1,48 @@ +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 91b8a3b..88c888e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ 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