Import wiredtiger: 8f93dcc74fe53f062bd77fbf0e9a0ce9aa03af1d from branch mongodb-master

ref: d69ee17961..8f93dcc74f
for: 6.2.0-rc0

WT-9983 Remove tiered timed out message. (#8364)

4 files changed, 4 insertions, 9 deletions

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index d37c28d4312..84cbe9353ab 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": "d69ee179611d881d06d0469480985992a7f186a2"
+    "commit": "8f93dcc74fe53f062bd77fbf0e9a0ce9aa03af1d"
 }
diff --git a/src/third_party/wiredtiger/src/conn/conn_tiered.c b/src/third_party/wiredtiger/src/conn/conn_tiered.c
index b29ba4208b3..43890e9af57 100644
--- a/src/third_party/wiredtiger/src/conn/conn_tiered.c
+++ b/src/third_party/wiredtiger/src/conn/conn_tiered.c
@@ -469,7 +469,7 @@ __wt_tiered_storage_destroy(WT_SESSION_IMPL *session, bool final_flush)
         __wt_cond_signal(session, conn->flush_cond);
     if (final_flush && conn->tiered_cond != NULL) {
         __wt_cond_signal(session, conn->tiered_cond);
-        WT_TRET(__wt_tiered_flush_work_wait(session, 30));
+        __wt_tiered_flush_work_wait(session, 30);
     }
     FLD_CLR(conn->server_flags, WT_CONN_SERVER_TIERED);
     if (conn->tiered_tid_set) {
diff --git a/src/third_party/wiredtiger/src/include/extern.h b/src/third_party/wiredtiger/src/include/extern.h
index bbebaf933e2..75394d48ff1 100644
--- a/src/third_party/wiredtiger/src/include/extern.h
+++ b/src/third_party/wiredtiger/src/include/extern.h
@@ -1513,8 +1513,6 @@ extern int __wt_tiered_conn_config(WT_SESSION_IMPL *session, const char **cfg, b
   WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
 extern int __wt_tiered_discard(WT_SESSION_IMPL *session, WT_TIERED *tiered, bool final)
   WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
-extern int __wt_tiered_flush_work_wait(WT_SESSION_IMPL *session, uint32_t timeout)
-  WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
 extern int __wt_tiered_name(WT_SESSION_IMPL *session, WT_DATA_HANDLE *dhandle, uint32_t id,
   uint32_t flags, const char **retp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
 extern int __wt_tiered_name_str(WT_SESSION_IMPL *session, const char *name, uint32_t id,
@@ -1896,6 +1894,7 @@ extern void __wt_stat_session_init_single(WT_SESSION_STATS *stats);
 extern void __wt_thread_group_start_one(
   WT_SESSION_IMPL *session, WT_THREAD_GROUP *group, bool is_locked);
 extern void __wt_thread_group_stop_one(WT_SESSION_IMPL *session, WT_THREAD_GROUP *group);
+extern void __wt_tiered_flush_work_wait(WT_SESSION_IMPL *session, uint32_t timeout);
 extern void __wt_tiered_get_drop_local(
   WT_SESSION_IMPL *session, uint64_t now, WT_TIERED_WORK_UNIT **entryp);
 extern void __wt_tiered_get_drop_shared(WT_SESSION_IMPL *session, WT_TIERED_WORK_UNIT **entryp);
diff --git a/src/third_party/wiredtiger/src/tiered/tiered_work.c b/src/third_party/wiredtiger/src/tiered/tiered_work.c
index 2d05db12b87..fc903034e74 100644
--- a/src/third_party/wiredtiger/src/tiered/tiered_work.c
+++ b/src/third_party/wiredtiger/src/tiered/tiered_work.c
@@ -128,7 +128,7 @@ __wt_tiered_pop_work(
  * __wt_tiered_flush_work_wait --
  *     Wait for all flush work units in the work queue to be processed.
  */
-int
+void
 __wt_tiered_flush_work_wait(WT_SESSION_IMPL *session, uint32_t timeout)
 {
     struct timespec now, start;
@@ -158,10 +158,6 @@ __wt_tiered_flush_work_wait(WT_SESSION_IMPL *session, uint32_t timeout)
         /* We are done if we don't find any work units or exceed the timeout. */
         done = !found || (WT_TIMEDIFF_SEC(now, start) > timeout);
     }
-    if (!found)
-        WT_RET(__wt_msg(
-          session, "tiered_flush_work_wait: timed out after %" PRIu32 " seconds", timeout));
-    return (0);
 }
 
 /*