Import wiredtiger: 3d7a2ba43c5217e93a318a319a9000f3c94a5c19 from branch mongodb-master (#31956)

GitOrigin-RevId: e2e9591

Author: wt-vendoring-bot[bot]

src/third_party/wiredtiger/import.data

@@ -2,5 +2,5 @@
     "vendor": "wiredtiger",
     "github": "wiredtiger/wiredtiger",
     "branch": "mongodb-master",
-    "commit": "9e998c004bc85d7d97974a1d4c945194f3eecb99"
+    "commit": "3d7a2ba43c5217e93a318a319a9000f3c94a5c19"
 }

src/third_party/wiredtiger/src/docs/command-line.dox

@@ -22,6 +22,8 @@ Specify an encryption secret key for the ::wiredtiger_open function.
 Specify a database home directory.
 @par \c -L
 Forcibly turn off logging subsystem for debugging purposes.
+@par \c -l directory
+Open a database that is in the process of being live restored. This parameter takes the path to the source directory as an argument.
 @par \c -m
 Verify the WiredTiger metadata as part of opening the database.
 @par \c -R

src/third_party/wiredtiger/src/utilities/util_main.c

@@ -46,8 +46,8 @@ usage(void)
 {
     static const char *options[] = {"-B", "maintain release 3.3 log file compatibility",
       "-C config", "wiredtiger_open configuration", "-E key", "secret encryption key", "-h home",
-      "database directory", "-L", "turn logging off for debug-mode", "-m", "run verify on metadata",
-      "-p",
+      "database directory", "-L", "turn logging off for debug-mode", "-l",
+      "run live restore using the path specified.", "-m", "run verify on metadata", "-p",
       "disable pre-fetching on the connection (use this option when dumping/verifying corrupted "
       "data)",
       "-R", "run recovery (if recovery configured)", "-r",
@@ -83,8 +83,8 @@ main(int argc, char *argv[])
     size_t len;
     int ch, major_v, minor_v, tret, (*func)(WT_SESSION *, int, char *[]);
     char *p, *secretkey;
-    const char *cmd_config, *conn_config, *p1, *p2, *p3, *readonly_config, *rec_config,
-      *salvage_config, *session_config;
+    const char *cmd_config, *conn_config, *live_restore_path, *p1, *p2, *p3, *readonly_config,
+      *rec_config, *salvage_config, *session_config;
     bool backward_compatible, disable_prefetch, logoff, meta_verify, readonly, recover, salvage;
 
     conn = NULL;
@@ -106,7 +106,8 @@ main(int argc, char *argv[])
         return (EXIT_FAILURE);
     }
 
-    cmd_config = conn_config = readonly_config = salvage_config = session_config = secretkey = NULL;
+    cmd_config = conn_config = live_restore_path = readonly_config = salvage_config =
+      session_config = secretkey = NULL;
     /*
      * We default to returning an error if recovery needs to be run. Generally we expect this to be
      * run after a clean shutdown. The printlog command disables logging entirely. If recovery is
@@ -117,7 +118,7 @@ main(int argc, char *argv[])
       false;
     /* Check for standard options. */
     __wt_optwt = 1; /* enable WT-specific behavior */
-    while ((ch = __wt_getopt(progname, argc, argv, "BC:E:h:LmpRrSVv?")) != EOF)
+    while ((ch = __wt_getopt(progname, argc, argv, "BC:E:h:l:LmpRrSVv?")) != EOF)
         switch (ch) {
         case 'B': /* backward compatibility */
             backward_compatible = true;
@@ -142,6 +143,9 @@ main(int argc, char *argv[])
             rec_config = REC_LOGOFF;
             logoff = true;
             break;
+        case 'l':
+            live_restore_path = __wt_optarg;
+            break;
         case 'm': /* verify metadata on connection open */
             cmd_config = "verify_metadata=true";
             meta_verify = true;
@@ -290,6 +294,11 @@ main(int argc, char *argv[])
         len += strlen(conn_config);
     if (cmd_config != NULL)
         len += strlen(cmd_config);
+    len += strlen("live_restore=(enabled=,threads_max=0,path=)");
+    if (live_restore_path != NULL)
+        len += strlen(live_restore_path) + strlen("true");
+    else
+        len += strlen("false");
     if (readonly_config != NULL)
         len += strlen(readonly_config);
     if (salvage_config != NULL)
@@ -305,8 +314,11 @@ main(int argc, char *argv[])
         (void)util_err(NULL, errno, NULL);
         goto err;
     }
-    if ((ret = __wt_snprintf(p, len, "error_prefix=wt,%s,%s,%s,%s,%s%s%s%s",
+    if ((ret = __wt_snprintf(p, len,
+           "error_prefix=wt,%s,%s,live_restore=(enabled=%s,threads_max=0,path=%s),%s,%s,%s%s%s%s",
            conn_config == NULL ? "" : conn_config, cmd_config == NULL ? "" : cmd_config,
+           live_restore_path == NULL ? "false" : "true",
+           live_restore_path == NULL ? "" : live_restore_path,
            readonly_config == NULL ? "" : readonly_config, rec_config,
            salvage_config == NULL ? "" : salvage_config, p1, p2, p3)) != 0) {
         (void)util_err(NULL, ret, NULL);

src/third_party/wiredtiger/test/format/backup.c

@@ -33,22 +33,29 @@
  *     Confirm the backup worked.
  */
 static void
-check_copy(uint64_t id)
+check_copy(WT_SESSION *session, uint64_t id)
 {
     WT_CONNECTION *conn;
     char from_path[MAX_FORMAT_PATH], to_path[MAX_FORMAT_PATH];
 
     /* Create the empty check directory. */
     testutil_create_backup_directory(g.home, id, true);
-    testutil_snprintf(from_path, sizeof(from_path), "%s/BACKUP", g.home);
     testutil_snprintf(to_path, sizeof(to_path), "%s/CHECK.%" PRIu64, g.home, id);
-    testutil_copy(from_path, to_path);
+    if (!GV(BACKUP_LIVE_RESTORE)) {
+        testutil_snprintf(from_path, sizeof(from_path), "%s/BACKUP", g.home);
+        testutil_copy(from_path, to_path);
+    }
 
     /* Now setup and open the path for real. */
+    g.backup_verify = true;
     wts_open(to_path, &conn, false);
+    g.backup_verify = false;
 
     /* Verify the objects. */
+    trace_msg(session, "Start %s backup verify in %s",
+      GV(BACKUP_LIVE_RESTORE) ? "live restore" : "copied", to_path);
     wts_verify(conn, true);
+    trace_msg(session, "Completed backup verify in %s", to_path);
 
     wts_close(&conn);
     /* If successful, remove the check directory. */
@@ -614,7 +621,7 @@ backup(void *arg)
                 incremental = mmrand(&g.extra_rnd, 1, 8);
         }
         /* Checking is done in a separate directory so we can check every iteration. */
-        check_copy(g.backup_id);
+        check_copy(session, g.backup_id);
         if (--incremental == 0)
             /* Periodically restart with a full backup. */
             incr_full = full = true;