diff options
Diffstat (limited to 'cmd/zdb/zdb_il.c')
| -rw-r--r-- | cmd/zdb/zdb_il.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/cmd/zdb/zdb_il.c b/cmd/zdb/zdb_il.c index 2db9c9c0c..c12178eff 100644 --- a/cmd/zdb/zdb_il.c +++ b/cmd/zdb/zdb_il.c @@ -25,7 +25,7 @@ */ /* - * Copyright (c) 2013, 2016 by Delphix. All rights reserved. + * Copyright (c) 2013, 2017 by Delphix. All rights reserved. */ /* @@ -42,6 +42,7 @@ #include <sys/resource.h> #include <sys/zil.h> #include <sys/zil_impl.h> +#include <sys/spa_impl.h> #include <sys/abd.h> #include "zdb.h" @@ -166,7 +167,7 @@ zil_prt_rec_write(zilog_t *zilog, int txtype, void *arg) if (lr->lr_common.lrc_reclen == sizeof (lr_write_t)) { (void) printf("%shas blkptr, %s\n", tab_prefix, !BP_IS_HOLE(bp) && - bp->blk_birth >= spa_first_txg(zilog->zl_spa) ? + bp->blk_birth >= spa_min_claim_txg(zilog->zl_spa) ? "will claim" : "won't claim"); print_log_bp(bp, tab_prefix); @@ -361,7 +362,7 @@ print_log_block(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t claim_txg) if (claim_txg != 0) claim = "already claimed"; - else if (bp->blk_birth >= spa_first_txg(zilog->zl_spa)) + else if (bp->blk_birth >= spa_min_claim_txg(zilog->zl_spa)) claim = "will claim"; else claim = "won't claim"; @@ -416,6 +417,11 @@ dump_intent_log(zilog_t *zilog) for (i = 0; i < TX_MAX_TYPE; i++) zil_rec_info[i].zri_count = 0; + /* see comment in zil_claim() or zil_check_log_chain() */ + if (zilog->zl_spa->spa_uberblock.ub_checkpoint_txg != 0 && + zh->zh_claim_txg == 0) + return; + if (verbose >= 2) { (void) printf("\n"); (void) zil_parse(zilog, print_log_block, print_log_record, NULL, |