Import wiredtiger: e1b78d648cddcd854c435b5c04848993de6e349a from branch mongodb-master

ref: 37670c7d34..e1b78d648c
for: 7.3.0-rc0

WT-11987 Modify the metadata base tracking to detect corruption better.

Author: lukech

src/third_party/wiredtiger/import.data

@@ -2,5 +2,5 @@
     "vendor": "wiredtiger",
     "github": "wiredtiger/wiredtiger.git",
     "branch": "mongodb-master",
-    "commit": "37670c7d34260232ea2fb0088229402381454459"
+    "commit": "e1b78d648cddcd854c435b5c04848993de6e349a"
 }

src/third_party/wiredtiger/src/conn/conn_dhandle.c

@@ -117,14 +117,14 @@ __conn_dhandle_config_set(WT_SESSION_IMPL *session)
     }
     dhandle->cfg[1] = metaconf;
     dhandle->meta_base = base;
-    dhandle->meta_base_length = base == NULL ? 0 : strlen(base);
-#ifdef HAVE_DIAGNOSTIC
     /*  Save the original metadata value for further check to avoid writing corrupted data. */
-    if (base == NULL)
-        dhandle->orig_meta_base = NULL;
-    else
+    if (base != NULL) {
+        dhandle->meta_hash = __wt_hash_city64(base, strlen(base));
+        __wt_epoch(session, &dhandle->base_upd);
         WT_ERR(__wt_strdup(session, base, &dhandle->orig_meta_base));
-#endif
+        dhandle->orig_meta_hash = dhandle->meta_hash;
+        dhandle->orig_upd = dhandle->base_upd;
+    }
     return (0);
 
 err:

src/third_party/wiredtiger/src/include/dhandle.h

@@ -79,16 +79,17 @@ struct __wt_data_handle {
     TAILQ_ENTRY(__wt_data_handle) q;
     TAILQ_ENTRY(__wt_data_handle) hashq;
 
-    const char *name;         /* Object name as a URI */
-    uint64_t name_hash;       /* Hash of name */
-    const char *checkpoint;   /* Checkpoint name (or NULL) */
-    int64_t checkpoint_order; /* Checkpoint order number, when applicable */
-    const char **cfg;         /* Configuration information */
-    const char *meta_base;    /* Base metadata configuration */
-    size_t meta_base_length;  /* Base metadata length */
-#ifdef HAVE_DIAGNOSTIC
+    const char *name;           /* Object name as a URI */
+    uint64_t name_hash;         /* Hash of name */
+    const char *checkpoint;     /* Checkpoint name (or NULL) */
+    int64_t checkpoint_order;   /* Checkpoint order number, when applicable */
+    const char **cfg;           /* Configuration information */
+    const char *meta_base;      /* Base metadata configuration */
+    uint64_t meta_hash;         /* Base metadata hash */
+    struct timespec base_upd;   /* Time of last metadata update with meta base */
     const char *orig_meta_base; /* Copy of the base metadata configuration */
-#endif
+    uint64_t orig_meta_hash;    /* Copy of base metadata hash */
+    struct timespec orig_upd;   /* Time of original setup of meta base */
     /*
      * Sessions holding a connection's data handle and queued tiered storage work units will hold
      * references; sessions using a connection's data handle will have a non-zero in-use count.

src/third_party/wiredtiger/src/meta/meta_ckpt.c

@@ -272,10 +272,11 @@ __wt_meta_checkpoint_clear(WT_SESSION_IMPL *session, const char *fname)
 static int
 __ckpt_set(WT_SESSION_IMPL *session, const char *fname, const char *v, bool use_base)
 {
+    struct timespec ts;
     WT_DATA_HANDLE *dhandle;
     WT_DECL_ITEM(tmp);
     WT_DECL_RET;
-    size_t meta_base_length;
+    uint64_t base_hash;
     char *config, *newcfg;
     const char *cfg[3], *meta_base, *str;
 
@@ -294,27 +295,23 @@ __ckpt_set(WT_SESSION_IMPL *session, const char *fname, const char *v, bool use_
 
         /* Check the metadata is not corrupted. */
         meta_base = dhandle->meta_base;
-        meta_base_length = strlen(meta_base);
-        if (dhandle->meta_base_length != meta_base_length)
+        base_hash = __wt_hash_city64(meta_base, strlen(meta_base));
+        __wt_epoch(session, &ts);
+        if (dhandle->meta_hash != base_hash)
             WT_ERR_PANIC(session, WT_PANIC,
-              "Corrupted metadata. The original metadata length was %lu while the new one is %lu.",
-              dhandle->meta_base_length, meta_base_length);
-#ifdef HAVE_DIAGNOSTIC
-        if (!WT_STREQ(dhandle->orig_meta_base, meta_base))
-            WT_ERR_PANIC(session, WT_PANIC,
-              "Corrupted metadata. The original metadata length was %lu while the new one is %lu. "
-              "The original metadata inserted was %s and the current "
+              "Corrupted metadata. The original metadata inserted was %s and the current "
               "metadata is now %s.",
-              dhandle->meta_base_length, meta_base_length, dhandle->orig_meta_base, meta_base);
-#endif
+              dhandle->orig_meta_base, meta_base);
+        else
+            /*
+             * Only if the hash matches, update the time structure to know when we last had a
+             * matching hash. If there is a problem with the metadata string then we have bounded
+             * the time from what is in the dhandle to the local time structure we have.
+             */
+            dhandle->base_upd = ts;
 
         /* Concatenate the metadata base string with the checkpoint string. */
         WT_ERR(__wt_buf_fmt(session, tmp, "%s,%s", meta_base, str));
-        /*
-         * Check the new metadata length is at least as long as the original metadata string with
-         * the checkpoint base stripped out.
-         */
-        WT_ASSERT(session, tmp->size >= dhandle->meta_base_length);
         WT_ERR(__wt_metadata_update(session, fname, tmp->mem));
     } else {
         /* Retrieve the metadata for this file. */