From 35e593da151e7bc08bb5409b9d770942431d64ae Mon Sep 17 00:00:00 2001 From: Chenhao Qu Date: Wed, 2 Nov 2022 11:57:23 +1100 Subject: Import wiredtiger: dd47ef1cde035e67010bdc95c456d1e59b0144e7 from branch mongodb-master ref: 0fc80dd1e7..dd47ef1cde for: 6.2.0-rc0 WT-10054 Review btree and backup cursor verbosity --- src/third_party/wiredtiger/import.data | 2 +- src/third_party/wiredtiger/src/btree/bt_sync.c | 19 +++++++++++-------- src/third_party/wiredtiger/src/cursor/cur_backup.c | 12 +++++++----- .../wiredtiger/src/cursor/cur_backup_incr.c | 10 +++++----- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 2784e70399a..fd75b638cc2 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "0fc80dd1e769b50f81227391436206d01ddd4aa1" + "commit": "dd47ef1cde035e67010bdc95c456d1e59b0144e7" } diff --git a/src/third_party/wiredtiger/src/btree/bt_sync.c b/src/third_party/wiredtiger/src/btree/bt_sync.c index 656525335d7..abb1ee86a52 100644 --- a/src/third_party/wiredtiger/src/btree/bt_sync.c +++ b/src/third_party/wiredtiger/src/btree/bt_sync.c @@ -136,20 +136,22 @@ __sync_delete_obsolete_ref(WT_SESSION_IMPL *session, WT_REF *ref) /* Ignore root pages as they can never be deleted. */ if (__wt_ref_is_root(ref)) { - __wt_verbose(session, WT_VERB_CHECKPOINT_CLEANUP, "%p: skipping root page", (void *)ref); + __wt_verbose_debug2( + session, WT_VERB_CHECKPOINT_CLEANUP, "%p: skipping root page", (void *)ref); return (0); } /* Ignore internal pages, these are taken care of during reconciliation. */ if (F_ISSET(ref, WT_REF_FLAG_INTERNAL)) { - __wt_verbose(session, WT_VERB_CHECKPOINT_CLEANUP, + __wt_verbose_debug2(session, WT_VERB_CHECKPOINT_CLEANUP, "%p: skipping internal page with parent: %p", (void *)ref, (void *)ref->home); return (0); } /* Fast-check, ignore deleted pages. */ if (ref->state == WT_REF_DELETED) { - __wt_verbose(session, WT_VERB_CHECKPOINT_CLEANUP, "%p: skipping deleted page", (void *)ref); + __wt_verbose_debug2( + session, WT_VERB_CHECKPOINT_CLEANUP, "%p: skipping deleted page", (void *)ref); return (0); } @@ -191,7 +193,7 @@ __sync_delete_obsolete_ref(WT_SESSION_IMPL *session, WT_REF *ref) } else WT_REF_UNLOCK(ref, previous_state); - __wt_verbose(session, WT_VERB_CHECKPOINT_CLEANUP, + __wt_verbose_debug2(session, WT_VERB_CHECKPOINT_CLEANUP, "%p on-disk page obsolete check: %s" "obsolete, stop time point %s", (void *)ref, obsolete ? "" : "not ", @@ -206,7 +208,7 @@ __sync_delete_obsolete_ref(WT_SESSION_IMPL *session, WT_REF *ref) * they might have split or been deleted while we were locking the WT_REF. */ if (previous_state != WT_REF_MEM) { - __wt_verbose(session, WT_VERB_CHECKPOINT_CLEANUP, "%p: skipping page", (void *)ref); + __wt_verbose_debug2(session, WT_VERB_CHECKPOINT_CLEANUP, "%p: skipping page", (void *)ref); return (0); } @@ -289,7 +291,7 @@ __sync_delete_obsolete_ref(WT_SESSION_IMPL *session, WT_REF *ref) WT_STAT_CONN_DATA_INCR(session, cc_pages_evict); } - __wt_verbose(session, WT_VERB_CHECKPOINT_CLEANUP, + __wt_verbose_debug2(session, WT_VERB_CHECKPOINT_CLEANUP, "%p in-memory page obsolete check: %s %s" "obsolete, stop time point %s", (void *)ref, tag, obsolete ? "" : "not ", @@ -313,7 +315,7 @@ __sync_ref_int_obsolete_cleanup(WT_SESSION_IMPL *session, WT_REF *parent) WT_REF *ref; uint32_t slot; - __wt_verbose(session, WT_VERB_CHECKPOINT_CLEANUP, + __wt_verbose_debug2(session, WT_VERB_CHECKPOINT_CLEANUP, "%p: traversing the internal page %p for obsolete child pages", (void *)parent, (void *)parent->page); @@ -387,7 +389,8 @@ __sync_page_skip( * timestamp. */ if (addr.type == WT_ADDR_LEAF_NO || addr.ta.newest_stop_durable_ts == WT_TS_NONE) { - __wt_verbose(session, WT_VERB_CHECKPOINT_CLEANUP, "%p: page walk skipped", (void *)ref); + __wt_verbose_debug2( + session, WT_VERB_CHECKPOINT_CLEANUP, "%p: page walk skipped", (void *)ref); WT_STAT_CONN_DATA_INCR(session, cc_pages_walk_skipped); *skipp = true; } diff --git a/src/third_party/wiredtiger/src/cursor/cur_backup.c b/src/third_party/wiredtiger/src/cursor/cur_backup.c index 488a3ba27c0..008bdc646cd 100644 --- a/src/third_party/wiredtiger/src/cursor/cur_backup.c +++ b/src/third_party/wiredtiger/src/cursor/cur_backup.c @@ -342,10 +342,11 @@ __backup_add_id(WT_SESSION_IMPL *session, WT_CONFIG_ITEM *cval) blk = &conn->incr_backups[i]; /* If it isn't already in use, we can use it. */ if (!F_ISSET(blk, WT_BLKINCR_INUSE)) { - __wt_verbose(session, WT_VERB_BACKUP, "Free blk[%u] entry", i); + __wt_verbose_debug2(session, WT_VERB_BACKUP, "Free blk[%u] entry", i); break; } - __wt_verbose(session, WT_VERB_BACKUP, "Entry blk[%u] has flags 0x%" PRIx8, i, blk->flags); + __wt_verbose_debug2( + session, WT_VERB_BACKUP, "Entry blk[%u] has flags 0x%" PRIx8, i, blk->flags); } /* * We didn't find an entry. This should not happen. @@ -355,7 +356,7 @@ __backup_add_id(WT_SESSION_IMPL *session, WT_CONFIG_ITEM *cval) /* Use the slot. */ if (blk->id_str != NULL) - __wt_verbose( + __wt_verbose_debug2( session, WT_VERB_BACKUP, "Freeing and reusing backup slot with old id %s", blk->id_str); /* Free anything that was there. */ __wt_free(session, blk->id_str); @@ -410,12 +411,13 @@ __backup_find_id(WT_SESSION_IMPL *session, WT_CONFIG_ITEM *cval, WT_BLKINCR **in WT_RET_MSG(session, EINVAL, "Incremental backup structure already in use"); if (incrp != NULL) *incrp = blk; - __wt_verbose( + __wt_verbose_debug2( session, WT_VERB_BACKUP, "Found src id %s at backup slot %u", blk->id_str, i); return (0); } } - __wt_verbose(session, WT_VERB_BACKUP, "Search %.*s not found", (int)cval->len, cval->str); + __wt_verbose_debug2( + session, WT_VERB_BACKUP, "Search %.*s not found", (int)cval->len, cval->str); return (WT_NOTFOUND); } diff --git a/src/third_party/wiredtiger/src/cursor/cur_backup_incr.c b/src/third_party/wiredtiger/src/cursor/cur_backup_incr.c index 8dfafe886fa..2d6622ee358 100644 --- a/src/third_party/wiredtiger/src/cursor/cur_backup_incr.c +++ b/src/third_party/wiredtiger/src/cursor/cur_backup_incr.c @@ -71,10 +71,10 @@ __curbackup_incr_blkmod(WT_SESSION_IMPL *session, WT_BTREE *btree, WT_CURSOR_BAC WT_ERR(__wt_config_subgets(session, &v, "offset", &b)); cb->offset = (uint64_t)b.val; - __wt_verbose(session, WT_VERB_BACKUP, + __wt_verbose_debug2(session, WT_VERB_BACKUP, "Found modified incr block gran %" PRIu64 " nbits %" PRIu64 " offset %" PRIu64, cb->granularity, cb->nbits, cb->offset); - __wt_verbose(session, WT_VERB_BACKUP, "Modified incr block config: \"%s\"", config); + __wt_verbose_debug2(session, WT_VERB_BACKUP, "Modified incr block config: \"%s\"", config); /* * The rename configuration string component was added later. So don't error if we don't @@ -154,7 +154,7 @@ __curbackup_incr_next(WT_CURSOR *cursor) * incremental cursor below and return WT_NOTFOUND. */ F_SET(cb, WT_CURBACKUP_INCR_INIT); - __wt_verbose(session, WT_VERB_BACKUP, "Set key WT_BACKUP_FILE %s size %" PRIuMAX, + __wt_verbose_debug2(session, WT_VERB_BACKUP, "Set key WT_BACKUP_FILE %s size %" PRIuMAX, cb->incr_file, (uintmax_t)size); __wt_cursor_set_key(cursor, 0, size, WT_BACKUP_FILE); } else { @@ -183,7 +183,7 @@ __curbackup_incr_next(WT_CURSOR *cursor) if (F_ISSET(cb, WT_CURBACKUP_RENAME) || (F_ISSET(cb, WT_CURBACKUP_CKPT_FAKE) && F_ISSET(cb, WT_CURBACKUP_HAS_CB_INFO))) { WT_ERR(__wt_fs_size(session, cb->incr_file, &size)); - __wt_verbose(session, WT_VERB_BACKUP, + __wt_verbose_debug2(session, WT_VERB_BACKUP, "Set key WT_BACKUP_FILE %s size %" PRIuMAX, cb->incr_file, (uintmax_t)size); __wt_cursor_set_key(cursor, 0, size, WT_BACKUP_FILE); goto done; @@ -220,7 +220,7 @@ __curbackup_incr_next(WT_CURSOR *cursor) WT_ERR(WT_NOTFOUND); WT_ASSERT(session, cb->granularity != 0); WT_ASSERT(session, total_len != 0); - __wt_verbose(session, WT_VERB_BACKUP, + __wt_verbose_debug2(session, WT_VERB_BACKUP, "Set key WT_BACKUP_RANGE %s offset %" PRIu64 " length %" PRIu64, cb->incr_file, cb->offset + cb->granularity * start_bitoff, total_len); __wt_cursor_set_key( -- cgit v1.2.1