Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Closes #11674
This commit is contained in:
Thomas Lamprecht 2021-03-05 21:15:35 +01:00 committed by Brian Behlendorf
parent 94b240bae0
commit bb9104f1e8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/zpool/zpool_main.c
View File

@ -7735,8 +7735,8 @@ print_removal_status(zpool_handle_t *zhp, pool_removal_stat_t *prs)
* do not print estimated time if hours_left is more than * do not print estimated time if hours_left is more than
* 30 days * 30 days
*/ */
(void) printf(gettext(" %s copied out of %s at %s/s, " (void) printf(gettext(
"%.2f%% done"), "\t%s copied out of %s at %s/s, %.2f%% done"),
examined_buf, total_buf, rate_buf, 100 * fraction_done); examined_buf, total_buf, rate_buf, 100 * fraction_done);
if (hours_left < (30 * 24)) { if (hours_left < (30 * 24)) {
(void) printf(gettext(", %lluh%um to go\n"), (void) printf(gettext(", %lluh%um to go\n"),
@ -7751,8 +7751,8 @@ print_removal_status(zpool_handle_t *zhp, pool_removal_stat_t *prs)
if (prs->prs_mapping_memory > 0) { if (prs->prs_mapping_memory > 0) {
char mem_buf[7]; char mem_buf[7];
zfs_nicenum(prs->prs_mapping_memory, mem_buf, sizeof (mem_buf)); zfs_nicenum(prs->prs_mapping_memory, mem_buf, sizeof (mem_buf));
(void) printf(gettext(" %s memory used for " (void) printf(gettext(
"removed device mappings\n"), "\t%s memory used for removed device mappings\n"),
mem_buf); mem_buf);
} }
} }