Import wiredtiger: 83f2b1b94c08e5d7c5b97a0fd77880cbb8989b82 from branch mongodb-master

ref: 8f489f4cc0..83f2b1b94c
for: 7.0.0-rc0

WT-10764 Adding a message to indicate that rollback to stable has finished

6 files changed, 19 insertions, 5 deletions

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 500994fb81f..41a5132c636 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": "8f489f4cc0d2599ff69a2cbabc8433b53bd8a8c7"
+    "commit": "83f2b1b94c08e5d7c5b97a0fd77880cbb8989b82"
 }
diff --git a/src/third_party/wiredtiger/src/include/rollback_to_stable.h b/src/third_party/wiredtiger/src/include/rollback_to_stable.h
index eb71d5ac302..140a51d02ed 100644
--- a/src/third_party/wiredtiger/src/include/rollback_to_stable.h
+++ b/src/third_party/wiredtiger/src/include/rollback_to_stable.h
@@ -9,6 +9,7 @@
 /*
  * Helper macros for finer-grained RTS verbose messaging categories.
  */
+#define WT_RTS_VERB_TAG_END "[END] "
 #define WT_RTS_VERB_TAG_FILE_SKIP "[FILE_SKIP] "
 #define WT_RTS_VERB_TAG_HS_ABORT_STOP "[HS_ABORT_STOP] "
 #define WT_RTS_VERB_TAG_HS_GT_ONDISK "[HS_GT_ONDISK] "
diff --git a/src/third_party/wiredtiger/src/rollback_to_stable/rts_api.c b/src/third_party/wiredtiger/src/rollback_to_stable/rts_api.c
index 95263b0c0b4..ce8bdcb86c1 100644
--- a/src/third_party/wiredtiger/src/rollback_to_stable/rts_api.c
+++ b/src/third_party/wiredtiger/src/rollback_to_stable/rts_api.c
@@ -75,7 +75,7 @@ __rollback_to_stable_int(WT_SESSION_IMPL *session, bool no_ckpt)
     WT_ORDERED_READ(pinned_timestamp, txn_global->pinned_timestamp);
     __wt_verbose_multi(session, WT_VERB_RECOVERY_RTS(session),
       WT_RTS_VERB_TAG_INIT
-      "performing rollback to stable with stable_timestamp=%s and oldest_timestamp=%s",
+      "start rollback to stable with stable_timestamp=%s and oldest_timestamp=%s",
       __wt_timestamp_to_string(rollback_timestamp, ts_string[0]),
       __wt_timestamp_to_string(txn_global->oldest_timestamp, ts_string[1]));
 
@@ -195,6 +195,9 @@ __rollback_to_stable(WT_SESSION_IMPL *session, const char *cfg[], bool no_ckpt)
     WT_STAT_CONN_SET(session, txn_rollback_to_stable_running, 1);
     WT_WITH_CHECKPOINT_LOCK(
       session, WT_WITH_SCHEMA_LOCK(session, ret = __rollback_to_stable_int(session, no_ckpt)));
+
+    __wt_verbose_multi(session, WT_VERB_RECOVERY_RTS(session),
+      WT_RTS_VERB_TAG_END "finished rollback to stable%s", dryrun ? " dryrun" : "");
     WT_STAT_CONN_SET(session, txn_rollback_to_stable_running, 0);
 
     __rollback_to_stable_finalize(S2C(session)->rts);
diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable42.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable42.py
index 8ccff05c020..296a1095c9f 100644
--- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable42.py
+++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable42.py
@@ -43,11 +43,12 @@ def custom_validator(data):
         "deleted page walk skipped",
         "page with reconciled",
         "performing recovery rollback",
-        "performing rollback to stable",
+        "start rollback to stable",
         "performing shutdown rollback",
         "recovered checkpoint snapshot",
         "rolling back tree",
-        "tree rolled back"
+        "tree rolled back",
+        "finished rollback to stable",
     ]
     needle = "skipped performing rollback to stable"
 
@@ -60,7 +61,7 @@ def custom_validator(data):
             if s in line:
                 ok = True
                 break
-        if not ok:
+        if not ok and not found:
             raise Exception("Got unexpected message: {}".format(line))
 
     if not found:
diff --git a/src/third_party/wiredtiger/tools/rts_verifier/checker.py b/src/third_party/wiredtiger/tools/rts_verifier/checker.py
index bb9ce01845e..2e3b07177b4 100644
--- a/src/third_party/wiredtiger/tools/rts_verifier/checker.py
+++ b/src/third_party/wiredtiger/tools/rts_verifier/checker.py
@@ -223,3 +223,7 @@ class Checker:
     def __apply_check_hs_truncated(self, operation):
         # TODO expand this out
         pass
+
+    def __apply_check_end(self, operation):
+        # TODO expand this out
+        pass
diff --git a/src/third_party/wiredtiger/tools/rts_verifier/operation.py b/src/third_party/wiredtiger/tools/rts_verifier/operation.py
index 4e3d88538df..4211e37bb12 100644
--- a/src/third_party/wiredtiger/tools/rts_verifier/operation.py
+++ b/src/third_party/wiredtiger/tools/rts_verifier/operation.py
@@ -37,6 +37,7 @@ class OpType(Enum):
     SKIP_DAMAGE = 28
     HS_TRUNCATED = 29
     SHUTDOWN_RTS = 30
+    END = 31
 
 class Operation:
     def __init__(self, line):
@@ -471,3 +472,7 @@ class Operation:
 
         matches = re.search('btree=(\d+)', line)
         self.btree_id = int(matches.group(1))
+
+
+    def __init_end(self, line):
+        self.type = OpType.END