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

zpool wait: print timestamp before the header 

list, status and iostat all display the -T timestamp before the header,
but wait showed it after. Make it be like the others.

Reported-by: Kyle Evans <kevans@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Closes #15825
This commit is contained in:
Rob N 2024-01-27 09:41:31 +11:00 committed by GitHub
parent aeb33776f5
commit 884a48d991
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/zpool/zpool_main.c
View File

@ -11042,6 +11042,9 @@ print_wait_status_row(wait_data_t *wd, zpool_handle_t *zhp, int row)
col_widths[i] = MAX(strlen(headers[i]), 6) + 2; col_widths[i] = MAX(strlen(headers[i]), 6) + 2;
} }
if (timestamp_fmt != NODATE)
print_timestamp(timestamp_fmt);
/* Print header if appropriate */ /* Print header if appropriate */
int term_height = terminal_height(); int term_height = terminal_height();
boolean_t reprint_header = (!wd->wd_headers_once && term_height > 0 && boolean_t reprint_header = (!wd->wd_headers_once && term_height > 0 &&
@ -11116,9 +11119,6 @@ print_wait_status_row(wait_data_t *wd, zpool_handle_t *zhp, int row)
if (vdev_any_spare_replacing(nvroot)) if (vdev_any_spare_replacing(nvroot))
bytes_rem[ZPOOL_WAIT_REPLACE] = bytes_rem[ZPOOL_WAIT_RESILVER]; bytes_rem[ZPOOL_WAIT_REPLACE] = bytes_rem[ZPOOL_WAIT_RESILVER];
if (timestamp_fmt != NODATE)
print_timestamp(timestamp_fmt);
for (i = 0; i < ZPOOL_WAIT_NUM_ACTIVITIES; i++) { for (i = 0; i < ZPOOL_WAIT_NUM_ACTIVITIES; i++) {
char buf[64]; char buf[64];
if (!wd->wd_enabled[i]) if (!wd->wd_enabled[i])