diff options
Diffstat (limited to 'src/third_party/wiredtiger/src/block')
6 files changed, 22 insertions, 20 deletions
diff --git a/src/third_party/wiredtiger/src/block/block_ckpt.c b/src/third_party/wiredtiger/src/block/block_ckpt.c index 08633e175c1..55138f2f4ea 100644 --- a/src/third_party/wiredtiger/src/block/block_ckpt.c +++ b/src/third_party/wiredtiger/src/block/block_ckpt.c @@ -52,7 +52,7 @@ __wt_block_checkpoint_load(WT_SESSION_IMPL *session, WT_BLOCK *block, const uint ci = NULL; - if (WT_VERBOSE_ISSET(session, WT_VERB_CHECKPOINT)) + if (WT_VERBOSE_LEVEL_ISSET(session, WT_VERB_CHECKPOINT, WT_VERBOSE_DEBUG_1)) __wt_ckpt_verbose(session, block, "load", NULL, addr, addr_size); /* @@ -634,7 +634,7 @@ __ckpt_process(WT_SESSION_IMPL *session, WT_BLOCK *block, WT_CKPT *ckptbase) if (F_ISSET(ckpt, WT_CKPT_FAKE) || !F_ISSET(ckpt, WT_CKPT_DELETE)) continue; - if (WT_VERBOSE_ISSET(session, WT_VERB_CHECKPOINT)) + if (WT_VERBOSE_LEVEL_ISSET(session, WT_VERB_CHECKPOINT, WT_VERBOSE_DEBUG_2)) __wt_ckpt_verbose(session, block, "delete", ckpt->name, ckpt->raw.data, ckpt->raw.size); /* @@ -907,7 +907,7 @@ __ckpt_update( WT_RET(__wt_block_ckpt_pack(session, block, &endp, ci, false)); ckpt->raw.size = WT_PTRDIFF(endp, ckpt->raw.mem); - if (WT_VERBOSE_ISSET(session, WT_VERB_CHECKPOINT)) + if (WT_VERBOSE_LEVEL_ISSET(session, WT_VERB_CHECKPOINT, WT_VERBOSE_DEBUG_2)) __wt_ckpt_verbose(session, block, "create", ckpt->name, ckpt->raw.data, ckpt->raw.size); return (0); diff --git a/src/third_party/wiredtiger/src/block/block_ckpt_scan.c b/src/third_party/wiredtiger/src/block/block_ckpt_scan.c index 8b2b4941158..7faee74c2ee 100644 --- a/src/third_party/wiredtiger/src/block/block_ckpt_scan.c +++ b/src/third_party/wiredtiger/src/block/block_ckpt_scan.c @@ -175,7 +175,7 @@ __block_checkpoint_update(WT_SESSION_IMPL *session, WT_BLOCK *block, struct save memset(&ci, 0, sizeof(ci)); checkpoint = info->checkpoint; - if (WT_VERBOSE_ISSET(session, WT_VERB_CHECKPOINT)) + if (WT_VERBOSE_LEVEL_ISSET(session, WT_VERB_CHECKPOINT, WT_VERBOSE_DEBUG_2)) __wt_ckpt_verbose( session, block, "import original", NULL, checkpoint->mem, checkpoint->size); @@ -193,7 +193,7 @@ __block_checkpoint_update(WT_SESSION_IMPL *session, WT_BLOCK *block, struct save WT_RET(__wt_block_ckpt_pack(session, block, &endp, &ci, false)); checkpoint->size = WT_PTRDIFF(endp, checkpoint->mem); - if (WT_VERBOSE_ISSET(session, WT_VERB_CHECKPOINT)) + if (WT_VERBOSE_LEVEL_ISSET(session, WT_VERB_CHECKPOINT, WT_VERBOSE_DEBUG_2)) __wt_ckpt_verbose( session, block, "import replace", NULL, checkpoint->mem, checkpoint->size); @@ -321,7 +321,7 @@ __wt_block_checkpoint_last(WT_SESSION_IMPL *session, WT_BLOCK *block, char **met if (write_gen < best->write_gen) continue; - __wt_verbose(session, WT_VERB_CHECKPOINT, + __wt_verbose_level(session, WT_VERB_CHECKPOINT, WT_VERBOSE_DEBUG_2, "scan: checkpoint block at offset %" PRIuMAX ", generation #%" PRIu64, (uintmax_t)offset, write_gen); diff --git a/src/third_party/wiredtiger/src/block/block_compact.c b/src/third_party/wiredtiger/src/block/block_compact.c index a033e5cefa8..7c01da01c19 100644 --- a/src/third_party/wiredtiger/src/block/block_compact.c +++ b/src/third_party/wiredtiger/src/block/block_compact.c @@ -77,7 +77,7 @@ __wt_block_compact_progress(WT_SESSION_IMPL *session, WT_BLOCK *block, u_int *ms struct timespec cur_time; uint64_t time_diff; - if (!WT_VERBOSE_LEVEL_ISSET(session, WT_VERB_COMPACT_PROGRESS, WT_VERBOSE_DEBUG_1)) + if (!WT_VERBOSE_LEVEL_ISSET(session, WT_VERB_COMPACT_PROGRESS, WT_VERBOSE_DEBUG_2)) return; __wt_epoch(session, &cur_time); @@ -121,7 +121,7 @@ __wt_block_compact_skip(WT_SESSION_IMPL *session, WT_BLOCK *block, bool *skipp) __wt_spin_lock(session, &block->live_lock); /* Dump the current state of the file. */ - if (WT_VERBOSE_LEVEL_ISSET(session, WT_VERB_COMPACT, WT_VERBOSE_DEBUG_1)) + if (WT_VERBOSE_LEVEL_ISSET(session, WT_VERB_COMPACT, WT_VERBOSE_DEBUG_2)) __block_dump_file_stat(session, block, true); /* Sum the available bytes in the initial 80% and 90% of the file. */ @@ -333,7 +333,7 @@ __block_dump_bucket_stat(WT_SESSION_IMPL *session, uintmax_t file_size, uintmax_ if (file_size > file_free) used_pct = (bucket_used * 100) / (file_size - file_free); - __wt_verbose_debug(session, WT_VERB_COMPACT, + __wt_verbose_debug2(session, WT_VERB_COMPACT, "%2u%%: %12" PRIuMAX "MB, (free: %" PRIuMAX "B, %" PRIuMAX "%%), (used: %" PRIuMAX "MB, %" PRIuMAX "B, %" PRIuMAX "%%)", bucket_pct, bucket_free / WT_MEGABYTE, bucket_free, free_pct, bucket_used / WT_MEGABYTE, diff --git a/src/third_party/wiredtiger/src/block/block_ext.c b/src/third_party/wiredtiger/src/block/block_ext.c index 17357c21958..85a03083c90 100644 --- a/src/third_party/wiredtiger/src/block/block_ext.c +++ b/src/third_party/wiredtiger/src/block/block_ext.c @@ -885,7 +885,7 @@ __wt_block_extlist_merge(WT_SESSION_IMPL *session, WT_BLOCK *block, WT_EXTLIST * WT_EXTLIST tmp; u_int i; - __wt_verbose(session, WT_VERB_BLOCK, "merging %s into %s", a->name, b->name); + __wt_verbose_debug2(session, WT_VERB_BLOCK, "merging %s into %s", a->name, b->name); /* * Sometimes the list we are merging is much bigger than the other: if so, swap the lists around @@ -1015,8 +1015,8 @@ __block_merge( after = NULL; } if (before == NULL && after == NULL) { - __wt_verbose(session, WT_VERB_BLOCK, "%s: insert range %" PRIdMAX "-%" PRIdMAX, el->name, - (intmax_t)off, (intmax_t)(off + size)); + __wt_verbose_debug2(session, WT_VERB_BLOCK, "%s: insert range %" PRIdMAX "-%" PRIdMAX, + el->name, (intmax_t)off, (intmax_t)(off + size)); return (__block_off_insert(session, el, off, size)); } @@ -1030,7 +1030,7 @@ __block_merge( if (before == NULL) { WT_RET(__block_off_remove(session, block, el, after->off, &ext)); - __wt_verbose(session, WT_VERB_BLOCK, + __wt_verbose_debug2(session, WT_VERB_BLOCK, "%s: range grows from %" PRIdMAX "-%" PRIdMAX ", to %" PRIdMAX "-%" PRIdMAX, el->name, (intmax_t)ext->off, (intmax_t)(ext->off + ext->size), (intmax_t)off, (intmax_t)(off + ext->size + size)); @@ -1044,7 +1044,7 @@ __block_merge( } WT_RET(__block_off_remove(session, block, el, before->off, &ext)); - __wt_verbose(session, WT_VERB_BLOCK, + __wt_verbose_debug2(session, WT_VERB_BLOCK, "%s: range grows from %" PRIdMAX "-%" PRIdMAX ", to %" PRIdMAX "-%" PRIdMAX, el->name, (intmax_t)ext->off, (intmax_t)(ext->off + ext->size), (intmax_t)ext->off, (intmax_t)(ext->off + ext->size + size)); @@ -1346,14 +1346,15 @@ __block_extlist_dump(WT_SESSION_IMPL *session, WT_BLOCK *block, WT_EXTLIST *el, u_int i; const char *sep; - if (!block->verify_layout && !WT_VERBOSE_ISSET(session, WT_VERB_BLOCK)) + if (!block->verify_layout && + !WT_VERBOSE_LEVEL_ISSET(session, WT_VERB_BLOCK, WT_VERBOSE_DEBUG_2)) return (0); WT_ERR(__wt_scr_alloc(session, 0, &t1)); if (block->verify_layout) level = WT_VERBOSE_NOTICE; else - level = WT_VERBOSE_DEBUG_1; + level = WT_VERBOSE_DEBUG_2; __wt_verbose_level(session, WT_VERB_BLOCK, level, "%s extent list %s, %" PRIu32 " entries, %s bytes", tag, el->name, el->entries, __wt_buf_set_size(session, el->bytes, true, t1)); diff --git a/src/third_party/wiredtiger/src/block/block_read.c b/src/third_party/wiredtiger/src/block/block_read.c index 82f128a770e..814a12d384a 100644 --- a/src/third_party/wiredtiger/src/block/block_read.c +++ b/src/third_party/wiredtiger/src/block/block_read.c @@ -156,8 +156,8 @@ __wt_block_read_off(WT_SESSION_IMPL *session, WT_BLOCK *block, WT_ITEM *buf, uin WT_BLOCK_HEADER *blk, swap; size_t bufsize; - __wt_verbose(session, WT_VERB_READ, "off %" PRIuMAX ", size %" PRIu32 ", checksum %#" PRIx32, - (uintmax_t)offset, size, checksum); + __wt_verbose_debug2(session, WT_VERB_READ, + "off %" PRIuMAX ", size %" PRIu32 ", checksum %#" PRIx32, (uintmax_t)offset, size, checksum); WT_STAT_CONN_INCR(session, block_read); WT_STAT_CONN_INCRV(session, block_byte_read, size); diff --git a/src/third_party/wiredtiger/src/block/block_write.c b/src/third_party/wiredtiger/src/block/block_write.c index e3522239db3..75ddd53001b 100644 --- a/src/third_party/wiredtiger/src/block/block_write.c +++ b/src/third_party/wiredtiger/src/block/block_write.c @@ -359,8 +359,9 @@ __block_write_off(WT_SESSION_IMPL *session, WT_BLOCK *block, WT_ITEM *buf, uint3 if (checkpoint_io) WT_STAT_CONN_INCRV(session, block_byte_write_checkpoint, align_size); - __wt_verbose(session, WT_VERB_WRITE, "off %" PRIuMAX ", size %" PRIuMAX ", checksum %#" PRIx32, - (uintmax_t)offset, (uintmax_t)align_size, checksum); + __wt_verbose_debug2(session, WT_VERB_WRITE, + "off %" PRIuMAX ", size %" PRIuMAX ", checksum %#" PRIx32, (uintmax_t)offset, + (uintmax_t)align_size, checksum); *objectidp = objectid; *offsetp = offset; |