Import wiredtiger: 8341cc7e4b2a411fb68b552dcaf456f120ba20e3 from branch mongodb-master

ref: 9c4af6eafa..8341cc7e4b
for: 6.3.0-rc0

WT-10144 Updating format.sh to check the timer if set during the resolve loop in case abort recovery take a long time.

2 files changed, 11 insertions, 3 deletions

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 726b8703736..af21291ffe8 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": "9c4af6eafad64efded04ae664513334ac1f8ff71"
+    "commit": "8341cc7e4b2a411fb68b552dcaf456f120ba20e3"
 }
diff --git a/src/third_party/wiredtiger/test/format/format.sh b/src/third_party/wiredtiger/test/format/format.sh
index cc8cb5198a5..e9a09deb20c 100755
--- a/src/third_party/wiredtiger/test/format/format.sh
+++ b/src/third_party/wiredtiger/test/format/format.sh
@@ -409,6 +409,7 @@ resolve()
 	running=0
 	list=$(ls $home | grep '^RUNDIR.[0-9]*.log')
 	for i in $list; do
+		check_timer
 		# Note the directory may not yet exist, only the log file.
 		dir="$home/${i%.*}"
 		log="$home/$i"
@@ -611,8 +612,11 @@ format()
 
 seconds=$((minutes * 60))
 start_time="$(date -u +%s)"
-while :; do
-	# Check if our time has expired.
+elapsed=0
+
+# Check if our time has expired. Updates force_quit if the timer has expired.
+check_timer()
+{
 	[[ $seconds -ne 0 ]] && {
 		now="$(date -u +%s)"
 		elapsed=$(($now - $start_time))
@@ -621,6 +625,10 @@ while :; do
 		[[ $elapsed -ge $seconds ]] &&
 			force_quit_reason "run timed out at $(date), after $elapsed seconds"
 	}
+}
+
+while :; do
+	check_timer
 
 	# Check if we're only running the smoke-tests and we're done.
 	[[ $smoke_test -ne 0 ]] && [[ $smoke_next -ge ${#smoke_list[@]} ]] && quit=1