Import wiredtiger: 9c7f5f02f7869c2f23eb44bb7ff24af44c4cb9a0 from branch mongodb-master

ref: 7310a36096..9c7f5f02f7
for: 6.2.0-rc0

WT-10083 Tiered verbose/error message improvements. (#8444)

1 files changed, 9 insertions, 1 deletions

diff --git a/src/third_party/wiredtiger/src/conn/conn_tiered.c b/src/third_party/wiredtiger/src/conn/conn_tiered.c
index f75767d7691..2b28cb56757 100644
--- a/src/third_party/wiredtiger/src/conn/conn_tiered.c
+++ b/src/third_party/wiredtiger/src/conn/conn_tiered.c
@@ -174,6 +174,10 @@ __tier_do_operation(WT_SESSION_IMPL *session, WT_TIERED *tiered, uint32_t id, co
 
     WT_ASSERT(session, (op == WT_TIERED_WORK_FLUSH || op == WT_TIERED_WORK_FLUSH_FINISH));
     tmp = NULL;
+    if (tiered->bstorage == NULL) {
+        __wt_verbose(session, WT_VERB_TIERED, "DO_OP: tiered %p NULL bstorage.", (void *)tiered);
+        WT_ASSERT(session, tiered->bstorage != NULL);
+    }
     storage_source = tiered->bstorage->storage_source;
     bucket_fs = tiered->bstorage->file_system;
 
@@ -366,6 +370,7 @@ __tiered_server(void *arg)
     WT_ITEM path, tmp;
     WT_SESSION_IMPL *session;
     uint64_t cond_time, time_start, time_stop, timediff;
+    const char *msg;
     bool signalled;
 
     session = arg;
@@ -396,8 +401,11 @@ __tiered_server(void *arg)
          *  - Remove any cached objects that are aged out.
          */
         if (timediff >= conn->tiered_interval || signalled) {
+            msg = "tier_storage_copy";
             WT_ERR(__tier_storage_copy(session));
+            msg = "tier_storage_finish";
             WT_ERR(__tier_storage_finish(session));
+            msg = "tier_storage_remove";
             WT_ERR(__tier_storage_remove(session, false));
             time_start = time_stop;
         }
@@ -405,7 +413,7 @@ __tiered_server(void *arg)
 
     if (0) {
 err:
-        WT_IGNORE_RET(__wt_panic(session, ret, "storage server error"));
+        WT_IGNORE_RET(__wt_panic(session, ret, "storage server error from %s", msg));
     }
     __wt_buf_free(session, &path);
     __wt_buf_free(session, &tmp);