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

zdb: fix overflow of time estimation 

The calculation of estimated time remaining in zdb -cc could overflow,
as reported in #10666. This patch fixes this, by using uint64_t instead
of ints in the calculations.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Teodor Spæren <teodor@sparen.no>
Closes #10666 
Closes #12610
This commit is contained in:
Teodor Spæren 2021-10-16 00:55:34 +02:00 committed by GitHub
parent afbc617921
commit 01b572bc62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/zdb/zdb.c
View File

@ -5469,9 +5469,9 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
uint64_t now = gethrtime(); uint64_t now = gethrtime();
char buf[10]; char buf[10];
uint64_t bytes = zcb->zcb_type[ZB_TOTAL][ZDB_OT_TOTAL].zb_asize; uint64_t bytes = zcb->zcb_type[ZB_TOTAL][ZDB_OT_TOTAL].zb_asize;
int kb_per_sec = uint64_t kb_per_sec =
1 + bytes / (1 + ((now - zcb->zcb_start) / 1000 / 1000)); 1 + bytes / (1 + ((now - zcb->zcb_start) / 1000 / 1000));
int sec_remaining = uint64_t sec_remaining =
(zcb->zcb_totalasize - bytes) / 1024 / kb_per_sec; (zcb->zcb_totalasize - bytes) / 1024 / kb_per_sec;
/* make sure nicenum has enough space */ /* make sure nicenum has enough space */
@ -5479,8 +5479,9 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
zfs_nicebytes(bytes, buf, sizeof (buf)); zfs_nicebytes(bytes, buf, sizeof (buf));
(void) fprintf(stderr, (void) fprintf(stderr,
"\r%5s completed (%4dMB/s) " "\r%5s completed (%4"PRIu64"MB/s) "
"estimated time remaining: %uhr %02umin %02usec ", "estimated time remaining: "
"%"PRIu64"hr %02"PRIu64"min %02"PRIu64"sec ",
buf, kb_per_sec / 1024, buf, kb_per_sec / 1024,
sec_remaining / 60 / 60, sec_remaining / 60 / 60,
sec_remaining / 60 % 60, sec_remaining / 60 % 60,