Import wiredtiger: 99bedf2bb6dc8a225fa399a87dc83d0845024a81 from branch mongodb-master

ref: 63e42104c5..99bedf2bb6
for: 6.2.0-rc0

WT-10058 Check OS-specific and filesystem verbosity

5 files changed, 18 insertions, 16 deletions

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 3f6f20d87f2..447eb7e8130 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": "63e42104c5319d64992ecf73d09e03e221b1b62b"
+    "commit": "99bedf2bb6dc8a225fa399a87dc83d0845024a81"
 }
diff --git a/src/third_party/wiredtiger/src/include/os_fhandle_inline.h b/src/third_party/wiredtiger/src/include/os_fhandle_inline.h
index 766a3fd843f..f2a74ea0ef0 100644
--- a/src/third_party/wiredtiger/src/include/os_fhandle_inline.h
+++ b/src/third_party/wiredtiger/src/include/os_fhandle_inline.h
@@ -106,8 +106,8 @@ __wt_read(WT_SESSION_IMPL *session, WT_FH *fh, wt_off_t offset, size_t len, void
     WT_DECL_RET;
     uint64_t time_start, time_stop;
 
-    __wt_verbose(session, WT_VERB_HANDLEOPS, "%s: handle-read: %" WT_SIZET_FMT " at %" PRIuMAX,
-      fh->handle->name, len, (uintmax_t)offset);
+    __wt_verbose_debug2(session, WT_VERB_HANDLEOPS,
+      "%s: handle-read: %" WT_SIZET_FMT " at %" PRIuMAX, fh->handle->name, len, (uintmax_t)offset);
 
     WT_STAT_CONN_INCR_ATOMIC(session, thread_read_active);
     WT_STAT_CONN_INCR(session, read_io);
@@ -185,8 +185,8 @@ __wt_write(WT_SESSION_IMPL *session, WT_FH *fh, wt_off_t offset, size_t len, con
       !F_ISSET(S2C(session), WT_CONN_READONLY) ||
         WT_STRING_MATCH(fh->name, WT_SINGLETHREAD, strlen(WT_SINGLETHREAD)));
 
-    __wt_verbose(session, WT_VERB_HANDLEOPS, "%s: handle-write: %" WT_SIZET_FMT " at %" PRIuMAX,
-      fh->handle->name, len, (uintmax_t)offset);
+    __wt_verbose_debug2(session, WT_VERB_HANDLEOPS,
+      "%s: handle-write: %" WT_SIZET_FMT " at %" PRIuMAX, fh->handle->name, len, (uintmax_t)offset);
 
     /*
      * Do a final panic check before I/O, so we stop writing as quickly as possible if there's an
diff --git a/src/third_party/wiredtiger/src/os_posix/os_fs.c b/src/third_party/wiredtiger/src/os_posix/os_fs.c
index bb5a80644fb..e5d07fb2cce 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_fs.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_fs.c
@@ -411,8 +411,9 @@ __posix_file_read(
     session = (WT_SESSION_IMPL *)wt_session;
     pfh = (WT_FILE_HANDLE_POSIX *)file_handle;
 
-    __wt_verbose(session, WT_VERB_READ, "read: %s, fd=%d, offset=%" PRId64 ", len=%" WT_SIZET_FMT,
-      file_handle->name, pfh->fd, offset, len);
+    __wt_verbose_debug2(session, WT_VERB_READ,
+      "read: %s, fd=%d, offset=%" PRId64 ", len=%" WT_SIZET_FMT, file_handle->name, pfh->fd, offset,
+      len);
 
     /* Assert direct I/O is aligned and a multiple of the alignment. */
     WT_ASSERT(session,
@@ -456,7 +457,7 @@ __posix_file_read_mmap(
     if (!pfh->mmap_file_mappable || pfh->mmap_resizing)
         return (__posix_file_read(file_handle, wt_session, offset, len, buf));
 
-    __wt_verbose(session, WT_VERB_READ,
+    __wt_verbose_debug2(session, WT_VERB_READ,
       "read-mmap: %s, fd=%d, offset=%" PRId64 ", len=%" WT_SIZET_FMT
       ", mapped buffer: %p, mapped size = %" PRId64,
       file_handle->name, pfh->fd, offset, len, (void *)pfh->mmap_buf, pfh->mmap_size);
@@ -564,7 +565,7 @@ __posix_file_truncate(WT_FILE_HANDLE *file_handle, WT_SESSION *wt_session, wt_of
     session = (WT_SESSION_IMPL *)wt_session;
     pfh = (WT_FILE_HANDLE_POSIX *)file_handle;
 
-    __wt_verbose(session, WT_VERB_FILEOPS,
+    __wt_verbose_debug2(session, WT_VERB_FILEOPS,
       "%s, file-truncate: size=%" PRId64 ", mapped size=%" PRId64, file_handle->name, len,
       pfh->mmap_size);
 
@@ -602,8 +603,9 @@ __posix_file_write(
     session = (WT_SESSION_IMPL *)wt_session;
     pfh = (WT_FILE_HANDLE_POSIX *)file_handle;
 
-    __wt_verbose(session, WT_VERB_WRITE, "write: %s, fd=%d, offset=%" PRId64 ", len=%" WT_SIZET_FMT,
-      file_handle->name, pfh->fd, offset, len);
+    __wt_verbose_debug2(session, WT_VERB_WRITE,
+      "write: %s, fd=%d, offset=%" PRId64 ", len=%" WT_SIZET_FMT, file_handle->name, pfh->fd,
+      offset, len);
 
     /* Assert direct I/O is aligned and a multiple of the alignment. */
     WT_ASSERT(session,
@@ -640,7 +642,7 @@ __posix_file_write_mmap(
     session = (WT_SESSION_IMPL *)wt_session;
     pfh = (WT_FILE_HANDLE_POSIX *)file_handle;
 
-    __wt_verbose(session, WT_VERB_WRITE,
+    __wt_verbose_debug2(session, WT_VERB_WRITE,
       "write-mmap: %s, fd=%d, offset=%" PRId64 ", len=%" WT_SIZET_FMT
       ", mapped buffer: %p, mapped size = %" PRId64,
       file_handle->name, pfh->fd, offset, len, (void *)pfh->mmap_buf, pfh->mmap_size);
diff --git a/src/third_party/wiredtiger/src/os_posix/os_mtx_cond.c b/src/third_party/wiredtiger/src/os_posix/os_mtx_cond.c
index b09a96a6e3e..6ee792b969b 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_mtx_cond.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_mtx_cond.c
@@ -72,7 +72,7 @@ __wt_cond_wait_signal(WT_SESSION_IMPL *session, WT_CONDVAR *cond, uint64_t usecs
         return;
     }
 
-    __wt_verbose(session, WT_VERB_MUTEX, "wait %s", cond->name);
+    __wt_verbose_debug2(session, WT_VERB_MUTEX, "wait %s", cond->name);
     WT_STAT_CONN_INCR(session, cond_wait);
 
     WT_ERR(pthread_mutex_lock(&cond->mtx));
@@ -152,7 +152,7 @@ __wt_cond_signal(WT_SESSION_IMPL *session, WT_CONDVAR *cond)
 {
     WT_DECL_RET;
 
-    __wt_verbose(session, WT_VERB_MUTEX, "signal %s", cond->name);
+    __wt_verbose_debug2(session, WT_VERB_MUTEX, "signal %s", cond->name);
 
     /*
      * Our callers often set flags to cause a thread to exit. Add a barrier to ensure exit flags are
diff --git a/src/third_party/wiredtiger/src/os_win/os_mtx_cond.c b/src/third_party/wiredtiger/src/os_win/os_mtx_cond.c
index 8077babc619..b0b439d1035 100644
--- a/src/third_party/wiredtiger/src/os_win/os_mtx_cond.c
+++ b/src/third_party/wiredtiger/src/os_win/os_mtx_cond.c
@@ -52,7 +52,7 @@ __wt_cond_wait_signal(WT_SESSION_IMPL *session, WT_CONDVAR *cond, uint64_t usecs
     if (__wt_atomic_addi32(&cond->waiters, 1) == 0)
         return;
 
-    __wt_verbose(session, WT_VERB_MUTEX, "wait %s", cond->name);
+    __wt_verbose_debug2(session, WT_VERB_MUTEX, "wait %s", cond->name);
     WT_STAT_CONN_INCR(session, cond_wait);
 
     EnterCriticalSection(&cond->mtx);
@@ -129,7 +129,7 @@ __wt_cond_signal(WT_SESSION_IMPL *session, WT_CONDVAR *cond)
 {
     WT_DECL_RET;
 
-    __wt_verbose(session, WT_VERB_MUTEX, "signal %s", cond->name);
+    __wt_verbose_debug2(session, WT_VERB_MUTEX, "signal %s", cond->name);
 
     /*
      * Our callers often set flags to cause a thread to exit. Add a barrier to ensure exit flags are