From 13106f65b27d7ed47fa39a7d4d679df5c3c4af3e Mon Sep 17 00:00:00 2001
From: Chenhao Qu <chenhao.qu@mongodb.com>
Date: Wed, 22 Dec 2021 18:32:25 +1100
Subject: Import wiredtiger: f8f4afb7ff5e17966bfc2d9ea39cbfea9aa6cfbe from
 branch mongodb-master

ref: 267bc7dbff..f8f4afb7ff
for: 5.3.0

WT-8581       Remove one of the many-dhandle-stress-test in evergreen.yml
---
 .../bench/workgen/runner/workgen_perf_check.sh     | 93 ----------------------
 src/third_party/wiredtiger/import.data             |  2 +-
 src/third_party/wiredtiger/test/evergreen.yml      | 18 -----
 3 files changed, 1 insertion(+), 112 deletions(-)
 delete mode 100755 src/third_party/wiredtiger/bench/workgen/runner/workgen_perf_check.sh

diff --git a/src/third_party/wiredtiger/bench/workgen/runner/workgen_perf_check.sh b/src/third_party/wiredtiger/bench/workgen/runner/workgen_perf_check.sh
deleted file mode 100755
index e9308435923..00000000000
--- a/src/third_party/wiredtiger/bench/workgen/runner/workgen_perf_check.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/bash
-#
-# Checks warnings and exceptions raised by a given workgen test as well as lantencies of specific operations.
-# This script is used in evergreen to assess performance using workgen.
-#
-
-usage () {
-    cat << EOF
-Usage: $0 test_name output threshold_1 threshold_2 threshold_3
-Arguments:
-    test_name    # Test to run
-    output       # File output
-    threshold_1  # Maximum allowed warnings from DROP operations.
-    threshold_2  # Maximum time in seconds a DROP operation can take.
-    threshold_3  # Maximum allowed warnings from CREATE/INSERT/UPDATE operations.
-EOF
-}
-
-if [ $1 == "-h" ]; then
-    usage
-    exit
-fi
-
-if [ "$#" -ne 5 ]; then
-    echo "Illegal number of parameters."
-    usage
-    echo FAILED
-    exit 1
-fi
-
-if [ ! -f $1 ]; then
-    echo "$1 does not exist."
-    echo FAILED
-    exit 1
-fi
-
-ERROR=0
-TEST=$1
-OUTPUT=$2
-DROP_WARNINGS_THRESHOLD=$3
-MAX_DROP_THRESHOLD=$4
-OP_WARNINGS_THRESHOLD=$5
-
-echo "python3 $TEST 2>&1 | tee $OUTPUT"
-python3 $TEST 2>&1 | tee $OUTPUT
-
-# Check exceptions
-if grep -io "exception" $OUTPUT; then
-    echo ERROR
-    ERROR=1
-fi
-
-# Maximum number of DROP warnings
-DROP_WARNINGS=$(grep -ic "cycling idle.*drop" $OUTPUT)
-echo "Number of long drop operations: $DROP_WARNINGS"
-
-# Maximum number of READ/INSERT/UPDATE warnings
-OP_WARNINGS=$(grep -ic "max latency exceeded" $OUTPUT)
-echo "Number of long read/insert/update operations: $OP_WARNINGS"
-
-# Output the 5 worst DROP latencies
-DROP_5=($(grep -i "cycling idle.*drop" $OUTPUT | awk '{print $9}' | sort -n | tail -5))
-echo -n "Five worst drop operations (s): "
-for ((i = 0; i < ${#DROP_5[@]}; ++i)); do
-    echo -n "${DROP_5[$i]} "
-done
-echo
-
-# Check if too many DROP operations took too long
-if [[ $DROP_WARNINGS -ge $DROP_WARNINGS_THRESHOLD ]]; then
-    echo "Too many long DROP operations: $DROP_WARNINGS (max allowed: $DROP_WARNINGS_THRESHOLD)"
-    ERROR=1
-fi
-
-# Check if a DROP operation took too long
-MAX_DROP=$(grep -i "cycling idle.*drop" $OUTPUT | awk '{print $9}' | sort -n | tail -1)
-if [[ $MAX_DROP -ge $MAX_DROP_THRESHOLD ]]; then
-    echo "A drop operation took too long: ${MAX_DROP}s (max allowed: ${MAX_DROP_THRESHOLD}s)"
-    ERROR=1
-fi
-
-# Check if too many READ/INSERT/UPDATE operations took too long
-if [[ $OP_WARNINGS -ge $OP_WARNINGS_THRESHOLD ]]; then
-    echo "Too many long read/insert/update operations: $OP_WARNINGS (max allowed: $OP_WARNINGS_THRESHOLD)"
-    ERROR=1
-fi
-
-if [[ $ERROR -ne 0 ]]; then
-    echo FAILED
-    exit 1
-fi
-
-echo SUCCESS
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index b730866f116..1f0c0752638 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": "267bc7dbff53702921e0c1b7a14ba0a50b4caafb"
+    "commit": "f8f4afb7ff5e17966bfc2d9ea39cbfea9aa6cfbe"
 }
diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml
index b0c6614b901..a356cdc7593 100755
--- a/src/third_party/wiredtiger/test/evergreen.yml
+++ b/src/third_party/wiredtiger/test/evergreen.yml
@@ -2955,23 +2955,6 @@ tasks:
         vars:
           format_test_script_args: -a -t 30
 
-  - name: many-dhandle-stress-test
-    commands:
-      - func: "get project"
-      - func: "compile wiredtiger"
-        vars:
-          configure_env_vars:
-            CXX=/opt/mongodbtoolchain/v3/bin/g++
-            PATH=/opt/mongodbtoolchain/v3/bin:$PATH ADD_CFLAGS="-ggdb -fPIC"
-      - command: shell.exec
-        params:
-          working_dir: "wiredtiger/bench/workgen/runner"
-          script: |
-            set -o errexit
-            set -o verbose
-            export "PATH=/opt/mongodbtoolchain/v3/bin:$PATH"
-            ./workgen_perf_check.sh many-dhandle-stress.py output.log 50 500 500
-
   - name: many-collection-test
     commands:
       - command: timeout.update
@@ -4187,7 +4170,6 @@ buildvariants:
     upload_source_dir: mongo-tests/largescale/many-collection/dbpath/diagnostic.data
     upload_filename: diagnostic.data.tgz
   tasks:
-    - name: many-dhandle-stress-test
     - name: many-collection-test
       distros: ubuntu2004-wt-large
 
-- 
cgit v1.2.1